提交: 07971b929785a6a08e42d3b0e0b70bf8334384e1 - chncpu (git)

Commit MetaInfo

• 修訂: 07971b929785a6a08e42d3b0e0b70bf8334384e1 (tree)
• 時間: 2014-06-10 17:21:10
• 作者: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

BitwiseOperationと2F-0プレフィックスを実装

Change Summary

• modified: chncpu/chncpu.c
• modified: chncpu/chncpu.h
• modified: chncpu/opcode.c
• modified: chncpu/test.hex

差異

--- a/chncpu/chncpu.c
+++ b/chncpu/chncpu.c
@@ -127,26 +127,27 @@ CHNCPU_RuntimeEnvironment *CHNCPU_CreateRuntimeEnvironment(void)
     
     env->appbinReader = malloc(sizeof(CH4Reader));
     
-    // bindOpFuncTable
+	// FuncTables
     for(i = 0; i <= CHNCPU_OPECODE_MAX; i++){
         env->bindOpFuncTable[i] = NULL;
     }
-    env->bindOpFuncTable[0x02] = CHNCPU_Op_LIMM_BindOperand;
-	env->bindOpFuncTable[0x10] = CHNCPU_Op_TernaryReg_BindOperand;
-    
-    // execOpFuncTable
-    for(i = 0; i <= CHNCPU_OPECODE_MAX; i++){
+	for(i = 0; i <= CHNCPU_OPECODE_MAX; i++){
         env->execOpFuncTable[i] = NULL;
     }
-    env->execOpFuncTable[0x02] = CHNCPU_Op_LIMM_Execute;
-	env->execOpFuncTable[0x10] = CHNCPU_Op_TernaryReg_Execute;
-    
-    // printOpFuncTable
-    for(i = 0; i <= CHNCPU_OPECODE_MAX; i++){
+	for(i = 0; i <= CHNCPU_OPECODE_MAX; i++){
         env->printOpFuncTable[i] = NULL;
     }
-    env->printOpFuncTable[0x02] = CHNCPU_Op_LIMM_PrintCode;
-	env->printOpFuncTable[0x10] = CHNCPU_Op_TernaryReg_PrintCode;
+	// LIMM
+    env->bindOpFuncTable[0x02] = CHNCPU_Op_LIMM_BindOperand;
+	env->execOpFuncTable[0x02] = CHNCPU_Op_LIMM_Execute;
+	env->printOpFuncTable[0x02] = CHNCPU_Op_LIMM_PrintCode;
+	
+	// TernaryRegBitwise
+	for(i = 0x10; i <= 0x11; i++){
+		env->bindOpFuncTable[i] = CHNCPU_Op_TernaryRegBitwise_BindOperand;
+		env->execOpFuncTable[i] = CHNCPU_Op_TernaryRegBitwise_Execute;
+		env->printOpFuncTable[i] = CHNCPU_Op_TernaryReg_PrintCode;
+	}
     
     env->errFlags = 0;
     
@@ -191,6 +192,7 @@ int CHNCPU_PrepareBinaryForExecution(CHNCPU_RuntimeEnvironment *env)
     CHNCPU_OpTag *op;
     int breakFlag = 0;
     int retv;
+	unsigned int prefix = 0;
     
     // env->appbinReaderから読み込んで、実行可能な状態にする。
     // これはコンパイラ版におけるコンパイルに相当する。
@@ -211,12 +213,26 @@ int CHNCPU_PrepareBinaryForExecution(CHNCPU_RuntimeEnvironment *env)
             case 0x00:
                 // NOP
                 puts("NOP();\n");
+				// メモリには追加しない
                 mindex--;
                 break;
+			case 0x2F:
+				// Prefix
+				opcode = CH4Reader_ReadNextAsUINT(env->appbinReader);
+				printf("Prefix-%X\n", opcode);
+				if(opcode > CHNCPU_PREFIX_MAX){
+					env->errFlags |= CHNCPU_ERR_C_PREFIX;
+                    breakFlag = 1;
+					break;
+				}
+				prefix |= (0x01 << opcode);
+				// メモリには追加しない
+				mindex--;
+				break;
             default:
                 // ごく一部の特殊な命令以外は、命令テーブルを参照する
                 if(opcode <= CHNCPU_OPECODE_MAX && env->bindOpFuncTable[opcode]){
-                    retv = env->bindOpFuncTable[opcode](env, op);
+                    retv = env->bindOpFuncTable[opcode](env, op, prefix);
                     if(retv){
                         opcode = CHNCPU_OPCODE_INVALID;
                     }
@@ -228,6 +244,7 @@ int CHNCPU_PrepareBinaryForExecution(CHNCPU_RuntimeEnvironment *env)
                     op->opCode = CHNCPU_OPCODE_INVALID;
                     breakFlag = 1;
                 }
+				prefix = 0;
                 break;
         }
 		if(env->appbinReader->errorFlags){
@@ -258,6 +275,9 @@ int CHNCPU_PrepareBinaryForExecution(CHNCPU_RuntimeEnvironment *env)
 		if(env->errFlags & CHNCPU_ERR_C_INVALID_BIN){
             puts("INVALID-C: Invalid binary.");
         }
+		if(env->errFlags & CHNCPU_ERR_C_PREFIX){
+			puts("INVALID-C: Invalid prefix.");
+		}
     }
     return 0;
 }
@@ -296,6 +316,9 @@ int CHNCPU_Execute(CHNCPU_RuntimeEnvironment *env)
         if(env->errFlags & CHNCPU_ERR_X_INTERNAL){
             puts("INVALID-X: Internal error.");
         }
+		if(env->errFlags & CHNCPU_ERR_X_TRUNCATED_VALUE){
+			puts("INVALID-X: Truncated value without prefix 2F-0.");
+		}
     }
     
     CHNCPU_DumpIReg(env);
@@ -348,4 +371,3 @@ int CHNCPU_CHK_IsAvailableBits(CHNCPU_RuntimeEnvironment *env, ch4_uint bits)
     }
     return 1;
 }
-

--- a/chncpu/chncpu.h
+++ b/chncpu/chncpu.h
@@ -21,15 +21,25 @@
 #define CHNCPU_LENGTH_OF_MAIN_MEMORY    (64 * 1024)     // per Op
 #define CHNCPU_SIZE_APPBIN              (1024 * 1024 * 1)
 #define CHNCPU_OPCODE_INVALID           (-1)
+#define CHNCPU_PREFIX_MAX               31
 
-#define CHNCPU_ERR_C_REGNUM         1
-#define CHNCPU_ERR_C_BITS           2
-#define CHNCPU_ERR_C_OPCODE         4
-#define CHNCPU_ERR_C_EXPRESSION		8
-#define CHNCPU_ERR_C_INTERNAL       16
-#define CHNCPU_ERR_C_INVALID_BIN    32
+// ErrorCode at compile
+#define CHNCPU_ERR_C_REGNUM             0x01
+#define CHNCPU_ERR_C_BITS               0x02
+#define CHNCPU_ERR_C_OPCODE             0x04
+#define CHNCPU_ERR_C_EXPRESSION         0x08
+#define CHNCPU_ERR_C_INTERNAL           0x10
+#define CHNCPU_ERR_C_INVALID_BIN        0x20
+#define CHNCPU_ERR_C_PREFIX             0x40
 
-#define CHNCPU_ERR_X_INTERNAL       1
+// ErrorCode in execution
+#define CHNCPU_ERR_X_INTERNAL           0x01
+#define CHNCPU_ERR_X_TRUNCATED_VALUE    0x02
+
+// (2F)Prefix
+#define CHNCPU_PREFIX_ALLOW_TRUNCATE    0x01
+
+#define CHNCPU_PREFIX_MASK_Op_TernaryRegBitwise (CHNCPU_PREFIX_ALLOW_TRUNCATE)
 
 typedef struct CHNCPU_OP_TAG CHNCPU_OpTag;
 struct CHNCPU_OP_TAG {
@@ -39,7 +49,7 @@ struct CHNCPU_OP_TAG {
 
 typedef struct CHNCPU_RUN_TIME_ENVIRONMENT CHNCPU_RuntimeEnvironment;
 struct CHNCPU_RUN_TIME_ENVIRONMENT {
-	int (*bindOpFuncTable[CHNCPU_OPECODE_MAX])(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
+	int (*bindOpFuncTable[CHNCPU_OPECODE_MAX])(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
     int (*execOpFuncTable[CHNCPU_OPECODE_MAX])(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
     int (*printOpFuncTable[CHNCPU_OPECODE_MAX])(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
     int iReg[CHNCPU_NUMBER_OF_IREG];
@@ -63,10 +73,10 @@ void CHNCPU_DumpIReg(CHNCPU_RuntimeEnvironment *env);
 int CHNCPU_CHK_IsAvailableBits(CHNCPU_RuntimeEnvironment *env, ch4_uint bits);
 
 // @opcode.c
-int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
+int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_LIMM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_LIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
-int CHNCPU_Op_TernaryReg_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
+int CHNCPU_Op_TernaryRegBitwise_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
+int CHNCPU_Op_TernaryRegBitwise_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_TernaryReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
 #endif

--- a/chncpu/opcode.c
+++ b/chncpu/opcode.c
@@ -18,7 +18,7 @@ struct CHNCPU_OP_CACHE_LIMM {
     ch4_uint r;
     ch4_uint bit;
 };
-int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
+int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_LIMM *opCache;
     
@@ -30,7 +30,7 @@ int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
     opCache->bit = CH4Reader_ReadNextAsUINT(env->appbinReader);
     
     CHNCPU_Op_LIMM_PrintCode(env, op, stdout);
-    
+	
     if(opCache->r >= CHNCPU_NUMBER_OF_IREG){
         env->errFlags |= CHNCPU_ERR_C_REGNUM;
         return -1;
@@ -42,6 +42,10 @@ int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
         env->errFlags |= CHNCPU_ERR_C_EXPRESSION;
         return -1;
     }
+	if(prefix != 0){
+		env->errFlags |= CHNCPU_ERR_C_PREFIX;
+        return -1;
+	}
     return 0;
 }
 int CHNCPU_Op_LIMM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
@@ -72,7 +76,10 @@ int CHNCPU_Op_LIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, F
 // Ternary Register Operation
 //
 
-// 10 CP/OR
+//	Bitwise
+//		10 CP/OR
+//		11 XOR
+//		12 AND
 
 typedef struct CHNCPU_OP_CACHE_TERNARY_REG CHNCPU_OpCache_TernaryReg;
 struct CHNCPU_OP_CACHE_TERNARY_REG {
@@ -80,8 +87,9 @@ struct CHNCPU_OP_CACHE_TERNARY_REG {
     ch4_uint r1;
     ch4_uint r2;
 	ch4_uint bit;
+	unsigned int prefix;
 };
-int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
+int CHNCPU_Op_TernaryRegBitwise_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_TernaryReg *opCache;
     
@@ -92,6 +100,7 @@ int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTa
     opCache->r2 = CH4Reader_ReadNextAsUINT(env->appbinReader);
     opCache->r0 = CH4Reader_ReadNextAsUINT(env->appbinReader);
 	opCache->bit = CH4Reader_ReadNextAsUINT(env->appbinReader);
+	opCache->prefix = prefix;
     
 	CHNCPU_Op_TernaryReg_PrintCode(env, op, stdout);
 	
@@ -104,36 +113,45 @@ int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTa
     if(!CHNCPU_CHK_IsAvailableBits(env, opCache->bit)){
         return -1;
     }
+	if((prefix | CHNCPU_PREFIX_MASK_Op_TernaryRegBitwise) != CHNCPU_PREFIX_MASK_Op_TernaryRegBitwise){
+		env->errFlags |= CHNCPU_ERR_C_PREFIX;
+        return -1;
+	}
     return 0;
 }
-int CHNCPU_Op_TernaryReg_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
+int CHNCPU_Op_TernaryRegBitwise_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
 {
     CHNCPU_OpCache_TernaryReg *opCache;
+	int opCode;
+	ch4_sint result;
     
     opCache = op->opCache;
+	opCode = op->opCode;
     
 	CHNCPU_Op_TernaryReg_PrintCode(env, op, stdout);
 	
-    switch (op->opCode) {
-		case 0x10:	// CP/OR
-			if(opCache->r1 == opCache->r2){
-				// CP
-				env->iReg[opCache->r0] = env->iReg[opCache->r1] & (0xFFFFFFFF >> (32 - opCache->bit));
-				env->iRegBits[opCache->r0] = opCache->bit;
-			} else{
-				// OR
-				env->errFlags |= CHNCPU_ERR_X_INTERNAL;
-				return -1;
-			}
-			break;
-		default:
-			env->errFlags |= CHNCPU_ERR_X_INTERNAL;
-			return -1;
+	if(opCode == 0x10){
+		if(opCache->r1 == opCache->r2){
+			// CP
+			result = env->iReg[opCache->r1];
+		} else{
+			// OR
+			result = env->iReg[opCache->r1] | env->iReg[opCache->r2];
+		}
+	} else if(opCode == 0x11){
+		// XOR
+		result = env->iReg[opCache->r1] ^ env->iReg[opCache->r2];
+	} else{
+		env->errFlags |= CHNCPU_ERR_X_INTERNAL;
+		return -1;
 	}
 	
-	if(!CHNCPU_CHK_IsAvailableBits(env, opCache->bit)){
-        return -1;
-    }
+	env->iReg[opCache->r0] = result & (0xFFFFFFFF >> (32 - opCache->bit));
+	if(!(opCache->prefix & CHNCPU_PREFIX_ALLOW_TRUNCATE) && env->iReg[opCache->r0] != result){
+		env->errFlags |= CHNCPU_ERR_X_TRUNCATED_VALUE;
+		return -1;
+	}
+	env->iRegBits[opCache->r0] = opCache->bit;
 	
 	return 0;
 }

--- a/chncpu/test.hex
+++ b/chncpu/test.hex
@@ -1 +1 @@
-2 E123 0 4 2 E365 1 88 90 1 1 2 4
\ No newline at end of file
+2 E123 0 90 2 E365 1 90 91 0 1 2 90
\ No newline at end of file