Commit: 5c23f39e5708c9dd8288c968957571698b98110f - chncpu (git)

Commit MetaInfo

• Revision: 5c23f39e5708c9dd8288c968957571698b98110f (tree)
• Time: 2014-06-23 23:58:37
• Author: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

どうにかcharsを実行できた！

Change Summary

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

Incremental Difference

--- a/chncpu/chncpu.h
+++ b/chncpu/chncpu.h
@@ -49,7 +49,8 @@
 // (2F)Prefix
 #define CHNCPU_PREFIX_ALLOW_TRUNCATE    0x01
 
-#define CHNCPU_PREFIX_MASK_Op_TernaryRegBitwise (CHNCPU_PREFIX_ALLOW_TRUNCATE)
+#define CHNCPU_PREFIX_MASK_Op_TernaryReg (CHNCPU_PREFIX_ALLOW_TRUNCATE)
+#define CHNCPU_PREFIX_MASK_Op_CompareIReg (CHNCPU_PREFIX_ALLOW_TRUNCATE)
 
 // Type of Pointer
 #define CHNCPU_PType_Undefined	0
@@ -160,6 +161,9 @@ int CHNCPU_Op_LIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, F
 int CHNCPU_Op_PLIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_PLIMM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_PLIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
+int CHNCPU_Op_CND_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
+int CHNCPU_Op_CND_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
+int CHNCPU_Op_CND_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
 int CHNCPU_Op_CALLBIOS_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_CALLBIOS_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_CALLBIOS_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
@@ -167,6 +171,9 @@ int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTa
 int CHNCPU_Op_TernaryRegBitwise_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_TernaryRegArithmetic_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_TernaryReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
+int CHNCPU_Op_CompareIReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
+int CHNCPU_Op_CompareIReg_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
+int CHNCPU_Op_CompareIReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
 
 // @bios.c
 CHNCPU_BIOS *CHNCPU_CreateBIOS(void);

--- a/chncpu/opcode.c
+++ b/chncpu/opcode.c
@@ -49,6 +49,11 @@ int CHNCPU_Op_Init(CHNCPU_OpTableSet *opSet)
 	opSet->execFuncTable[0x03] = CHNCPU_Op_PLIMM_Execute;
 	opSet->printFuncTable[0x03] = CHNCPU_Op_PLIMM_PrintCode;
 	
+	// CND
+    opSet->bindFuncTable[0x04] = CHNCPU_Op_CND_BindOperand;
+	opSet->execFuncTable[0x04] = CHNCPU_Op_CND_Execute;
+	opSet->printFuncTable[0x04] = CHNCPU_Op_CND_PrintCode;
+	
 	// CALLBIOS
 	opSet->bindFuncTable[0x05] = CHNCPU_Op_CALLBIOS_BindOperand;
 	opSet->execFuncTable[0x05] = CHNCPU_Op_CALLBIOS_Execute;
@@ -71,7 +76,12 @@ int CHNCPU_Op_Init(CHNCPU_OpTableSet *opSet)
 		opSet->execFuncTable[i] = CHNCPU_Op_TernaryRegArithmetic_Execute;
 		opSet->printFuncTable[i] = CHNCPU_Op_TernaryReg_PrintCode;
 	}
-	
+	//
+	for(i = 0x20; i <= 0x27; i++){
+		opSet->bindFuncTable[i] = CHNCPU_Op_CompareIReg_BindOperand;
+		opSet->execFuncTable[i] = CHNCPU_Op_CompareIReg_Execute;
+		opSet->printFuncTable[i] = CHNCPU_Op_CompareIReg_PrintCode;
+	}
 	return 0;
 }
 
@@ -186,7 +196,7 @@ int CHNCPU_Op_LIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, F
 }
 
 //
-// 02 PLIMM
+// 03 PLIMM
 //
 
 typedef struct _CHNCPU_OP_CACHE_PLIMM CHNCPU_OpCache_PLIMM;
@@ -250,6 +260,56 @@ int CHNCPU_Op_PLIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op,
 }
 
 //
+// 04 CND
+//
+
+typedef struct _CHNCPU_OP_CACHE_CND CHNCPU_OpCache_CND;
+struct _CHNCPU_OP_CACHE_CND {
+    ch4_uint r;
+};
+int CHNCPU_Op_CND_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
+{
+    CHNCPU_OpCache_CND *opCache;
+    
+    opCache = malloc(sizeof(CHNCPU_OpCache_CND));
+    op->opCache = opCache;
+    
+    opCache->r = CH4Reader_ReadNextAsUINT(env->appbinReader);
+    
+    if(opCache->r >= CHNCPU_NUMBER_OF_PREG){
+        env->errFlags |= CHNCPU_ERR_C_REGNUM;
+        return -1;
+    }
+	if(prefix != 0){
+		env->errFlags |= CHNCPU_ERR_C_PREFIX;
+        return -1;
+	}
+    return 0;
+}
+int CHNCPU_Op_CND_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
+{
+    CHNCPU_OpCache_CND *opCache;
+    
+    opCache = op->opCache;
+    
+	if((env->iReg[opCache->r] & 0x1) != 0x1){
+		// 次の命令は実行しない
+		env->currentIndex++;
+	}
+	return 0;
+}
+
+int CHNCPU_Op_CND_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file)
+{
+    CHNCPU_OpCache_CND *opCache;
+    
+    opCache = op->opCache;
+    fprintf(file, "CND(r:%02X);\n", opCache->r);
+	
+    return 0;
+}
+
+//
 // 05 CALLBIOS
 //
 int CHNCPU_Op_CALLBIOS_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
@@ -360,7 +420,7 @@ 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){
+	if((prefix | CHNCPU_PREFIX_MASK_Op_TernaryReg) != CHNCPU_PREFIX_MASK_Op_TernaryReg){
 		env->errFlags |= CHNCPU_ERR_C_PREFIX;
         return -1;
 	}
@@ -408,14 +468,6 @@ int CHNCPU_Op_TernaryRegBitwise_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_O
 }
 int CHNCPU_Op_TernaryRegArithmetic_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
 {
-	//	Arithmetic
-	//		14 ADD
-	//		15 SUB
-	//		16 MUL
-	//		18 SHL
-	//		19 SAR
-	//		1A DIV
-	//		1B MOD
     CHNCPU_OpCache_TernaryReg *opCache;
 	int opCode;
 	ch4_sint result;
@@ -484,8 +536,146 @@ int CHNCPU_Op_TernaryReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag
 		fprintf(file, "(%02X)", op->opCode);
 	}
 	
-	fprintf(file, "(r0:%d, r1:%02X, r2:%02X, bit:%02X);\n", opCache->r0, opCache->r1, opCache->r2, opCache->bit);
+	fprintf(file, "(r0:%02X, r1:%02X, r2:%02X, bit:%d);\n", opCache->r0, opCache->r1, opCache->r2, opCache->bit);
 	
     return 0;
 }
 
+//
+// Compare Integer Register Operation
+//
+
+//		20 CMPE
+//		21 CMPNE
+//		22 CMPL
+//		23 CMPGE
+//		24 CMPLE
+//		25 CMPG
+//		26 TSTZ
+//		27 TSTNZ
+
+typedef struct _CHNCPU_OP_CACHE_COMPARE_IREG CHNCPU_OpCache_CompareIReg;
+struct _CHNCPU_OP_CACHE_COMPARE_IREG {
+    ch4_uint rSrc1;
+    ch4_uint rSrc2;
+    ch4_uint bitDiff;
+	ch4_uint rDst;
+	ch4_uint bitDst;
+	unsigned int prefix;
+};
+int CHNCPU_Op_CompareIReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
+{
+    CHNCPU_OpCache_CompareIReg *opCache;
+    
+    opCache = malloc(sizeof(CHNCPU_OpCache_TernaryReg));
+    op->opCache = opCache;
+    
+    opCache->rSrc1 = CH4Reader_ReadNextAsUINT(env->appbinReader);
+    opCache->rSrc2 = CH4Reader_ReadNextAsUINT(env->appbinReader);
+    opCache->bitDiff = CH4Reader_ReadNextAsUINT(env->appbinReader);
+	opCache->rDst = CH4Reader_ReadNextAsUINT(env->appbinReader);
+	opCache->bitDst = CH4Reader_ReadNextAsUINT(env->appbinReader);
+	opCache->prefix = prefix;
+	
+    if(opCache->rSrc1 >= CHNCPU_NUMBER_OF_IREG ||
+	   opCache->rSrc2 >= CHNCPU_NUMBER_OF_IREG ||
+	   opCache->rDst >= CHNCPU_NUMBER_OF_IREG){
+        env->errFlags |= CHNCPU_ERR_C_REGNUM;
+        return -1;
+    }
+    if(!CHNCPU_CHK_IsAvailableBits(env, opCache->bitDiff) ||
+	   !CHNCPU_CHK_IsAvailableBits(env, opCache->bitDst)){
+        return -1;
+    }
+	if((prefix | CHNCPU_PREFIX_MASK_Op_CompareIReg) != CHNCPU_PREFIX_MASK_Op_CompareIReg){
+		env->errFlags |= CHNCPU_ERR_C_PREFIX;
+        return -1;
+	}
+    return 0;
+}
+int CHNCPU_Op_CompareIReg_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
+{
+    CHNCPU_OpCache_CompareIReg *opCache;
+	int opCode;
+	ch4_sint result;
+	//ch4_sint diff;
+	ch4_sint r1, r2;
+    
+    opCache = op->opCache;
+	opCode = op->opCode;
+	
+	// check with bitDiff
+	/*
+	// この機能は未実装
+	diff = env->iReg[opCache->rSrc1] - env->iReg[opCache->rSrc2];
+	CHNCPU_AdjustValueForBit(env, &diff, opCache->bitDiff, opCache->prefix);
+	if(env->errFlags){
+		return -1;
+	}
+	 */
+	
+	r1 = env->iReg[opCache->rSrc1];
+	r2 = env->iReg[opCache->rSrc2];
+	
+	if(opCode == 0x20){
+		result = (r1 == r2) ? -1 : 0;
+	} else if(opCode == 0x21){
+		result = (r1 != r2) ? -1 : 0;
+	} else if(opCode == 0x22){
+		result = (r1 < r2) ? -1 : 0;
+	} else if(opCode == 0x23){
+		result = (r1 >= r2) ? -1 : 0;
+	} else if(opCode == 0x24){
+		result = (r1 <= r2) ? -1 : 0;
+	} else if(opCode == 0x25){
+		result = (r1 > r2) ? -1 : 0;
+	} else if(opCode == 0x26){
+		result = ((r1 & r2) == 0) ? -1 : 0;
+	} else if(opCode == 0x27){
+		result = ((r1 & r2) != 0) ? -1 : 0;
+	} else{
+		env->errFlags |= CHNCPU_ERR_X_INTERNAL;
+		return -1;
+	}
+	// check with bitDst
+	if(opCache->bitDst == 0){
+		env->errFlags |= CHNCPU_ERR_X_TRUNCATED_VALUE;
+		return -1;
+	}
+	// store
+	if(!env->errFlags){
+		env->iReg[opCache->rDst] = result;
+		env->iRegBits[opCache->rDst] = opCache->bitDst;
+	}
+	return 0;
+}
+
+char *CHNCPU_Op_CompareIReg_MnemonicList0[8] = {
+	// 20-27
+	"CMPE",
+	"CMPNE",
+	"CMPL",
+	"CMPGE",
+	"CMPLE",
+	"CMPG",
+	"TSTZ",
+	"TSTNZ",
+};
+int CHNCPU_Op_CompareIReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file)
+{
+    CHNCPU_OpCache_CompareIReg *opCache;
+    
+    opCache = op->opCache;
+    
+	if(0x20 <= op->opCode && op->opCode <= 0x27){
+		fprintf(file, "%s", CHNCPU_Op_CompareIReg_MnemonicList0[op->opCode - 0x20]);
+	} else{
+		fprintf(file, "(%02X)", op->opCode);
+	}
+	
+	fprintf(file, "(rDst:%02X, bitDst:%d r1:%02X, r2:%02X, bitDiff:%d);\n", opCache->rDst, opCache->bitDst, opCache->rSrc1, opCache->rSrc2, opCache->bitDiff);
+	
+    return 0;
+}
+
+

--- a/chncpu/test.hex
+++ b/chncpu/test.hex
@@ -1,6 +1,9 @@
 2 a0 0 90
 2 1 1 90
+2 C7E 2 90
 1 1 0
 5 0 0
 94 0 1 0 90
+a4 0 2 90 bf 90
+4 bf
 3 1 bf