Commit: df3004692a76a25cbdc7f5e1287e8e8492f8417a - chncpu (git)

Commit MetaInfo

• Révision: df3004692a76a25cbdc7f5e1287e8e8492f8417a (tree)
• l'heure: 2014-07-08 22:07:42
• Auteur: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Message de Log

SMEMを実装。
意外と簡単だった。

Change Summary

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

Modification

--- a/chncpu/chncpu.h
+++ b/chncpu/chncpu.h
@@ -217,6 +217,10 @@ int CHNCPU_Op_LMEM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op,
 int CHNCPU_Op_LMEM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_LMEM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
 //
+int CHNCPU_Op_SMEM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
+int CHNCPU_Op_SMEM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
+int CHNCPU_Op_SMEM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
+//
 int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_TernaryRegBitwise_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_TernaryRegArithmetic_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
@@ -256,6 +260,7 @@ CHNCPU_Data *CHNCPU_DATA_CreateDataFromFileAsPType(const char dataPath[], ch4_si
 int CHNCPU_DATA_AssignDataTagToPReg(CHNCPU_RuntimeEnvironment *env, ch4_uint p, CHNCPU_Data *data);
 int CHNCPU_DATA_WriteRawDataToFile(CHNCPU_Data *data, const char dataPath[], int dataCount, int dataType);
 int CHNCPU_DATA_ReadAtIndex(CHNCPU_Data *data, int index, unsigned int *errFlags);
+int CHNCPU_DATA_WriteToIndex(CHNCPU_Data *data, int index, int value, unsigned int *errFlags);
 int CHNCPU_DATA_CalculateByteSizeOfRawData(ch4_sint dataType, ch4_uint dataCount);
 int CHNCPU_DATA_PrintData(CHNCPU_Data *data, FILE *file);
 

--- a/chncpu/data.c
+++ b/chncpu/data.c
@@ -185,6 +185,27 @@ int CHNCPU_DATA_ReadAtIndex(CHNCPU_Data *data, int index, unsigned int *errFlags
 	return retv;
 }
 
+int CHNCPU_DATA_WriteToIndex(CHNCPU_Data *data, int index, int value, unsigned int *errFlags)
+{
+	if(!data || index < 0 || index >= data->count){
+		if(errFlags){
+			*errFlags |= CHNCPU_ERR_BAD_ACCESS;
+		}
+        return -1;
+	}
+	
+	if(data->type == CHNCPU_PType_UINT8){
+	 	((unsigned char *)data->rawData)[index] = value;
+	} else{
+		if(errFlags){
+			*errFlags |= CHNCPU_ERR_INVALID_PTYPE;
+		}
+        return -1;
+	}
+	
+	return index;
+}
+
 int CHNCPU_DATA_CalculateByteSizeOfRawData(ch4_sint dataType, ch4_uint dataCount)
 {
 	if(dataType == CHNCPU_PType_UINT8){

--- a/chncpu/opcache.h
+++ b/chncpu/opcache.h
@@ -71,7 +71,7 @@ struct _CHNCPU_OP_CACHE_CND {
 //
 // 08 LMEM
 //
-// p (sint)pType (sint)pDiff rDst bitDst
+// 08 p (sint)pType (sint)pDiff rDst bitDst
 //
 typedef struct _CHNCPU_OP_CACHE_LMEM CHNCPU_OpCache_LMEM;
 struct _CHNCPU_OP_CACHE_LMEM {
@@ -83,6 +83,20 @@ struct _CHNCPU_OP_CACHE_LMEM {
 };
 
 //
+// 09 SMEM
+//
+// 09 rDst bitDst p (sint)pType (sint)pDiff
+//
+typedef struct _CHNCPU_OP_CACHE_SMEM CHNCPU_OpCache_SMEM;
+struct _CHNCPU_OP_CACHE_SMEM {
+    ch4_uint r;
+	ch4_uint bitSrc;
+    ch4_uint p;
+    ch4_sint pType;
+	ch4_sint pDiff;
+};
+
+//
 // 10-12, 14-16, 18-1B Ternary Register Operation
 //
 // opCode r1 r2 r0 bit

--- a/chncpu/opcode.c
+++ b/chncpu/opcode.c
@@ -65,6 +65,11 @@ int CHNCPU_Op_Init(CHNCPU_OpTableSet *opSet)
 	opSet->execFuncTable[0x08] = CHNCPU_Op_LMEM_Execute;
 	opSet->printFuncTable[0x08] = CHNCPU_Op_LMEM_PrintCode;
 	
+	// SMEM
+	opSet->bindFuncTable[0x09] = CHNCPU_Op_SMEM_BindOperand;
+	opSet->execFuncTable[0x09] = CHNCPU_Op_SMEM_Execute;
+	opSet->printFuncTable[0x09] = CHNCPU_Op_SMEM_PrintCode;
+	
 	// TernaryRegBitwise
 	for(i = 0x10; i <= 0x12; i++){
 		opSet->bindFuncTable[i] = CHNCPU_Op_TernaryReg_BindOperand;
@@ -422,7 +427,7 @@ int CHNCPU_Op_LMEM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
 		return -1;
 	}
 	
-	CHNCPU_AdjustValueForBit(env, &value, opCache->bitDst, CHNCPU_PREFIX_ALLOW_TRUNCATE);
+	CHNCPU_AdjustValueForBit(env, &value, opCache->bitDst, 0);
 	if(env->errFlags){
 		return -1;
 	}
@@ -444,6 +449,73 @@ int CHNCPU_Op_LMEM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, F
 }
 
 //
+// 09 SMEM
+//
+int CHNCPU_Op_SMEM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
+{
+    CHNCPU_OpCache_SMEM *opCache;
+    
+    opCache = malloc(sizeof(CHNCPU_OpCache_SMEM));
+    op->opCache = opCache;
+    
+	opCache->r = CH4Reader_ReadNextAsUINT(env->appbinReader);
+	opCache->bitSrc = CH4Reader_ReadNextAsUINT(env->appbinReader);
+    opCache->p = CH4Reader_ReadNextAsUINT(env->appbinReader);
+    opCache->pType = CH4Reader_ReadNextAsSINT(env->appbinReader);
+    opCache->pDiff = CH4Reader_ReadNextAsSINT(env->appbinReader);
+	
+    
+    if(opCache->r >= CHNCPU_NUMBER_OF_IREG ||
+	   opCache->p >= CHNCPU_NUMBER_OF_PREG){
+        env->errFlags |= CHNCPU_ERR_INVALID_REGNUM;
+        return -1;
+    }
+    if(!CHNCPU_CHK_IsAvailableBits(env, opCache->bitSrc)){
+        return -1;
+    }
+	if(prefix != 0){
+		env->errFlags |= CHNCPU_ERR_INVALID_PREFIX;
+        return -1;
+	}
+    return 0;
+}
+int CHNCPU_Op_SMEM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op)
+{
+    CHNCPU_OpCache_SMEM *opCache;
+	CHNCPU_PointerTag *p;
+	int value;
+    
+    opCache = op->opCache;
+    p = &env->pReg[opCache->p];
+    
+	if(p->type != opCache->pType){
+		env->errFlags |= CHNCPU_ERR_NOT_MATCHED_PTYPE;
+        return -1;
+	}
+	
+	value = env->iReg[opCache->r];
+	
+	CHNCPU_AdjustValueForBit(env, &value, opCache->bitSrc, CHNCPU_PREFIX_ALLOW_TRUNCATE);
+	if(env->errFlags){
+		return -1;
+	}
+	CHNCPU_DATA_WriteToIndex(p->data, p->pindex, value, &env->errFlags);
+	
+	p->pindex += opCache->pDiff;
+    
+    return 0;
+}
+int CHNCPU_Op_SMEM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file)
+{
+    CHNCPU_OpCache_SMEM *opCache;
+    
+    opCache = op->opCache;
+    fprintf(file, "SMEM(r:%02X, bitDst:%d, p:0x%02X, pType:0x%X, pDiff:%d);\n", opCache->r, opCache->bitSrc, opCache->p, opCache->pType, opCache->pDiff);
+	
+    return 0;
+}
+
+//
 // Ternary Register Operation
 //
 int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)

--- a/chncpu/test.hex
+++ b/chncpu/test.hex
@@ -5,6 +5,7 @@ c32 0 a0 c30 a0 0
 1 1 0
 88 c30 c10 1 bf a0
 5 0 bf
+89 bf a0 c00 c10 1
 94 0 1 0 a0
 a2 0 c30 c20 bf a0
 4 bf