Generating machine instructions from an unresolved data structure so that the assembler code can use anything before declared. (WORK IN PROGRESS...)

Author: Dawoodoz

Source/DFPSR/api/mediaMachineAPI.cpp

@@ -97,12 +97,12 @@ class MediaMemory : public PlanarMemory<MEDIA_MACHINE_TYPE_COUNT> {
 // Type definitions
 static const VMTypeDef<MEDIA_MACHINE_TYPE_COUNT> mediaMachineTypes[] = {
 	VMTypeDef<MEDIA_MACHINE_TYPE_COUNT>(U"FixedPoint", DataType_FixedPoint, true,
-	[](PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, Variable<MEDIA_MACHINE_TYPE_COUNT>& variable, int32_t globalIndex, int32_t* framePointer, bool fullContent) {
+	[](PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, Variable<MEDIA_MACHINE_TYPE_COUNT>& variable, int32_t globalIndex, const FixedArray<int32_t, MEDIA_MACHINE_TYPE_COUNT>& framePointer, bool fullContent) {
 		FixedPoint value = MEDIA_MEMORY.fixedPointMemory.accessByGlobalIndex(globalIndex, framePointer[DataType_FixedPoint]);
 		printText(variable.name, U"(", value, U")");
 	}),
 	VMTypeDef<MEDIA_MACHINE_TYPE_COUNT>(U"ImageU8", DataType_ImageU8, false,
-	[](PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, Variable<MEDIA_MACHINE_TYPE_COUNT>& variable, int32_t globalIndex, int32_t* framePointer, bool fullContent) {
+	[](PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, Variable<MEDIA_MACHINE_TYPE_COUNT>& variable, int32_t globalIndex, const FixedArray<int32_t, MEDIA_MACHINE_TYPE_COUNT>& framePointer, bool fullContent) {
 		AlignedImageU8 value = MEDIA_MEMORY.alignedImageU8Memory.accessByGlobalIndex(globalIndex, framePointer[DataType_ImageU8]);
 		printText(variable.name, U" ImageU8");
 		if (image_exists(value)) {
@@ -116,7 +116,7 @@ static const VMTypeDef<MEDIA_MACHINE_TYPE_COUNT> mediaMachineTypes[] = {
 		}
 	}),
 	VMTypeDef<MEDIA_MACHINE_TYPE_COUNT>(U"ImageRgbaU8", DataType_ImageRgbaU8, false,
-	[](PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, Variable<MEDIA_MACHINE_TYPE_COUNT>& variable, int32_t globalIndex, int32_t* framePointer, bool fullContent) {
+	[](PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, Variable<MEDIA_MACHINE_TYPE_COUNT>& variable, int32_t globalIndex, const FixedArray<int32_t, MEDIA_MACHINE_TYPE_COUNT>& framePointer, bool fullContent) {
 		OrderedImageRgbaU8 value = MEDIA_MEMORY.orderedImageRgbaU8Memory.accessByGlobalIndex(globalIndex, framePointer[DataType_ImageRgbaU8]);
 		printText(variable.name, U" ImageRgbaU8");
 		if (image_exists(value)) {
@@ -168,9 +168,15 @@ static const InsSig<MEDIA_MACHINE_TYPE_COUNT> mediaMachineInstructions[] = {
 		[](VirtualMachine<MEDIA_MACHINE_TYPE_COUNT>& machine, PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, const List<VMA>& args) {
 			int32_t targetAddress = args[0].index;
 			// TODO: Assert that the target address is within the same method when running in debug mode.
+			//       VirtualMachine.h only asserts that we are within the whole program's instructions.
+			#ifdef VIRTUAL_MACHINE_DEBUG_PRINT
+				printText(U"Jumping from instruction ", memory.current.programCounter, U" to ", targetAddress, U".\n");
+			#endif
 			memory.current.programCounter = targetAddress;
 		},
-		ArgSig(U"InstructionAddress", true, DataType_InstructionAddress)
+		// The argument for labels is matched with the Label type before we know the label's final instruction address,
+		//   but label indices it will be converted into DataType_InstructionAddress once all machine instructions are generated.
+		ArgSig(U"Address", true, DataType_Label)
 	),
 	InsSig<MEDIA_MACHINE_TYPE_COUNT>::create(U"ROUND", 1,
 		[](VirtualMachine<MEDIA_MACHINE_TYPE_COUNT>& machine, PlanarMemory<MEDIA_MACHINE_TYPE_COUNT>& memory, const List<VMA>& args) {