Commit: 97433c0a8cb22d69552482b5a6f58f470495428a - chncpu (git)

Commit MetaInfo

• Revision: 97433c0a8cb22d69552482b5a6f58f470495428a (tree)
• Time: 2014-07-08 21:50:13
• Author: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

MALLOC命令を追加。
しかしSMEMがまだないので無意味…

Change Summary

• modified: chncpu.xcodeproj/xcuserdata/hikaru.xcuserdatad/xcschemes/chncpu.xcscheme
• modified: chncpu/chncpu.c
• modified: chncpu/chncpu.h
• modified: chncpu/opcode.c
• modified: chncpu/test.hex
• modified: debug.c

Incremental Difference

--- a/chncpu.xcodeproj/xcuserdata/hikaru.xcuserdatad/xcschemes/chncpu.xcscheme
+++ b/chncpu.xcodeproj/xcuserdata/hikaru.xcuserdatad/xcschemes/chncpu.xcscheme
@@ -71,7 +71,7 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "-bd 30 30 10 1 dst.txt "
+            argument = "-bd 00 00 10 1 dst.txt "
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

--- a/chncpu/chncpu.c
+++ b/chncpu/chncpu.c
@@ -247,7 +247,7 @@ int CHNCPU_PrepareBinaryForExecution(CHNCPU_RuntimeEnvironment *env)
 				if(op->opCode <= CHNCPU_OPECODE_MAX && opSet->printFuncTable[op->opCode]){
 					opSet->printFuncTable[op->opCode](env, op, stdout);
 				} else{
-					printf("Unknown op: 0x%X", op->opCode);
+					printf("Unknown op: 0x%X\n", op->opCode);
 				}
 #endif
 				prefix = 0;

--- a/chncpu/chncpu.h
+++ b/chncpu/chncpu.h
@@ -16,9 +16,9 @@
 
 // DEBUG Flag
 #define DEBUG_PRINT_APPBIN_BEFORE_EXECUTION	0
-#define DEBUG_PRINT_IREG_AFTER_EXECUTION		0
-#define DEBUG_PRINT_PREG_AFTER_EXECUTION    0
-#define DEBUG_PRINT_OP_BINDING				0
+#define DEBUG_PRINT_IREG_AFTER_EXECUTION		1
+#define DEBUG_PRINT_PREG_AFTER_EXECUTION    1
+#define DEBUG_PRINT_OP_BINDING				1
 #define DEBUG_PRINT_OP_EXECUTING			0
 
 // VM flags
@@ -231,7 +231,10 @@ int CHNCPU_Op_DATA_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_DATA_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
 CHNCPU_Data *CHNCPU_Op_DATA_GetData(CHNCPU_OpTag *op);
 //
-int CHNCPU_Op_Prefix2F_PrintWikiDoc(int opCode, FILE *file);
+int CHNCPU_Op_MALLOC_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
+int CHNCPU_Op_MALLOC_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
+int CHNCPU_Op_MALLOC_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
+
 
 // @bios.c
 CHNCPU_BIOS *CHNCPU_CreateBIOS(void);

--- a/chncpu/opcode.c
+++ b/chncpu/opcode.c
@@ -92,6 +92,10 @@ int CHNCPU_Op_Init(CHNCPU_OpTableSet *opSet)
 	opSet->bindFuncTable[0x2E] = CHNCPU_Op_DATA_BindOperand;
 	opSet->execFuncTable[0x2E] = CHNCPU_Op_DATA_Execute;
 	opSet->printFuncTable[0x2E] = CHNCPU_Op_DATA_PrintCode;
+	// MALLOC
+	opSet->bindFuncTable[0x32] = CHNCPU_Op_MALLOC_BindOperand;
+	opSet->execFuncTable[0x32] = CHNCPU_Op_MALLOC_Execute;
+	opSet->printFuncTable[0x32] = CHNCPU_Op_MALLOC_PrintCode;
 	return 0;
 }
 
@@ -773,7 +777,7 @@ CHNCPU_Data *CHNCPU_Op_DATA_GetData(CHNCPU_OpTag *op)
 //
 // 32 MALLOC
 //
-/*
+
 int CHNCPU_Op_MALLOC_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_MALLOC *opCache;
@@ -806,7 +810,7 @@ int CHNCPU_Op_MALLOC_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *o
 
 int CHNCPU_Op_MALLOC_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
 {
-	CHNCPU_OpTag *dataOpTag;
+	CHNCPU_Data *data;
     CHNCPU_OpCache_MALLOC *opCache;
 	ch4_sint type;
 	ch4_uint count;
@@ -816,20 +820,21 @@ int CHNCPU_Op_MALLOC_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
     type = env->iReg[opCache->rType];
 	count = env->iReg[opCache->rCount];
 	
-	dataOpTag = CHNCPU_Op_DATA_CreateEmptyData();
-	if(CHNCPU_Op_DATA_AllocateRawDataMemory(dataOpTag, type, count, &env->errFlags)){
+	data = CHNCPU_DATA_CreateEmptyData();
+	if(CHNCPU_DATA_AllocateRawDataMemory(data, type, count, &env->errFlags)){
 		return -1;
 	}
 	
+	CHNCPU_DATA_AssignDataTagToPReg(env, opCache->p, data);
+	
 	return 0;
 }
 int CHNCPU_Op_MALLOC_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file)
 {
-    CHNCPU_OpCache_LMEM *opCache;
+    CHNCPU_OpCache_MALLOC *opCache;
     
     opCache = op->opCache;
-    fprintf(file, "LMEM(p:0x%02X, pType:0x%X, pDiff:%d, r:%02X, bitDst:%d);\n", opCache->p, opCache->pType, opCache->pDiff, opCache->r, opCache->bitDst);
+    fprintf(file, "MALLOC(rType:%02X, bitType:%d, rCount:%02X, bitCount:%d, p:%02X);\n", opCache->rType, opCache->bitType, opCache->rCount, opCache->bitCount, opCache->p);
 	
     return 0;
 }
-*/
\ No newline at end of file

--- a/chncpu/test.hex
+++ b/chncpu/test.hex
@@ -1,9 +1,11 @@
-2 0 0 90
-2 1 1 90
+2 c10 0 a0
+c32 0 a0 c30 a0 0
+2 0 0 a0
+2 1 1 a0
 1 1 0
-88 c30 90 1 bf 90
+88 c30 c10 1 bf a0
 5 0 bf
-94 0 1 0 90
-a2 0 c30 90 bf 90
+94 0 1 0 a0
+a2 0 c30 c20 bf a0
 4 bf
 3 1 bf

--- a/debug.c
+++ b/debug.c
@@ -52,7 +52,7 @@ void CHNCPU_DumpPReg(CHNCPU_RuntimeEnvironment *env)
 			if(env->pReg[i].mindex != CHNCPU_MemoryIndex_INVALID){
 				printf("P%02X: Type:%2X  mem[%d][%d]", i, env->pReg[i].type, env->pReg[i].mindex, env->pReg[i].pindex);
 			} else{
-				printf("P%02X: Type:%2X  %s[%d]", i, env->pReg[i].type, env->pReg[i].data->filePath, env->pReg[i].pindex);
+				printf("P%02X: Type:%2X  %s[%d]\t(Len:%d)", i, env->pReg[i].type, env->pReg[i].data->filePath, env->pReg[i].pindex, env->pReg[i].data->count);
 			}
 			putchar('\n');
             regs++;