提交: e22a783b2c4a38d213d4a7fc534ebbd0c8769cb3 - OSECPU_VM_2 (git)

Commit MetaInfo

• 修訂: e22a783b2c4a38d213d4a7fc534ebbd0c8769cb3 (tree)
• 時間: 2014-05-08 01:21:18
• 作者: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

2014-05-04 (日) 12:08:08 のコメントでの自分の提案を実装してみた。
動作が同一であることは確認した。

Change Summary

• modified: extend.c
• modified: float.c
• modified: hh4.c
• modified: integer.c
• modified: osecpu-vm.h
• modified: pointer.c

差異

--- a/extend.c
+++ b/extend.c
@@ -13,10 +13,12 @@ int instrLengthExtend(const Int32 *src, const Int32 *src1)
 	return 0;
 }
 
-Int32 *hh4DecodeExtend(OsecpuJitc *jitc, Int32 opecode)
+const char *instrTypesExtend(OsecpuJitc *jitc, Int32 opecode)
 // instrLengthSimpleInitTool()で登録していないものだけに反応すればよい.
 {
-	return jitc->dst;
+	char *retstr = NULL;
+	
+	return retstr;
 }
 
 int jitcStepExtend(OsecpuJitc *jitc)

--- a/float.c
+++ b/float.c
@@ -25,55 +25,18 @@ int instrLengthFloat(const Int32 *src, const Int32 *src1)
 	return retcode;
 }
 
-Int32 *hh4DecodeFloat(OsecpuJitc *jitc, Int32 opecode)
-// instrLengthSimpleInitTool()で登録していないものだけに反応すればよい.
+const char *instrTypesFloat(OsecpuJitc *jitc, Int32 opecode)
 {
-	HH4Reader *hh4r = jitc->hh4r;
-	Int32 *dst = jitc->hh4dst, *dst1 = jitc->hh4dst1;
-	int i;
+	char *retstr = NULL;
 	if (opecode == 0x40) {
-		i = hh4GetUnsigned(hh4r);
-		if (i == 0) {
- 			if (dst + 5 > dst1)
-				goto err;
-			*dst = opecode;
-			dst[1] = i; // imm-typ(0)
-			dst[2] = hh4GetSigned(hh4r); // imm
-			dst[3] = hh4GetUnsigned(hh4r); // f
-			dst[4] = hh4GetUnsigned(hh4r); // bit
-			dst += 5;
-			goto fin;
-		}
-		if (i == 1) {
-			if (dst + 5 > dst1)
-				goto err;
-			*dst = opecode;
-			dst[1] = i; // imm-typ(1)
-			dst[2] = hh4Get4Nbit(hh4r, 32 / 4); // imm
-			dst[3] = hh4GetUnsigned(hh4r); // f
-			dst[4] = hh4GetUnsigned(hh4r); // bit
-			dst += 5;
-			goto fin;
-		}
-		if (i == 2) {
-			if (dst + 6 > dst1)
-				goto err;
-			*dst = opecode;
-			dst[1] = i; // imm-typ(2)
-			dst[2] = hh4Get4Nbit(hh4r, 32 / 4); // imm-high
-			dst[3] = hh4Get4Nbit(hh4r, 32 / 4); // imm-low
-			dst[4] = hh4GetUnsigned(hh4r); // f
-			dst[5] = hh4GetUnsigned(hh4r); // bit
-			dst += 6;
-			goto fin;
-		}
+		// このhh4rで読み進めても元のhh4rは進まない
+		HH4Reader hh4r = *jitc->hh4r;
+		Int32 mod = hh4GetUnsigned(&hh4r);
+		if (mod == 0) retstr = "usuu"; // 40, imm-typ(0), imm, f, bit.
+		if (mod == 1) retstr = "ufuu"; // 40, imm-typ(1), imm-f32, f, bit.
+		if (mod == 2) retstr = "uduu"; // 40, imm-typ(2), imm-f64, f, bit.
 	}
-fin:
-	jitc->dst = dst;
-	return dst;
-err:
-	jitc->errorCode = JITC_HH4_DST_OVERRUN;
-	return dst;
+	return retstr;
 }
 
 void jitcStep_checkFxx(int *pRC, int fxx)

--- a/hh4.c
+++ b/hh4.c
@@ -82,44 +82,92 @@ Int32 hh4Get4Nbit(HH4Reader *hh4r, int n)
 
 Int32 *hh4Decode(OsecpuJitc *jitc)
 {
+	// hh4バイナリを内部形式に変換する
+	// instrLengthSimpleに登録されている命令の引数はすべてunsignedとして扱う
+	// そうでない場合はそれぞれのinstrTypesから得られる文字列を元にデコードする
+	// instrTypesの書式:
+	// u: hh4GetUnsigned
+	// s: hh4GetSigned
+	// f: hh4Get4Nbit (float)
+	// d: hh4Get4Nbit, hh4Get4Nbit (double)
 	HH4Reader *hh4r = jitc->hh4r;
 	Int32 *dst = jitc->hh4dst, *dst1 = jitc->hh4dst1;
 
 	jitc->errorCode = 0;
 	for (;;) {
-		if (hh4r->p >= hh4r->p1)
+		if (hh4r->p >= hh4r->p1){
+			// 読み込みが末端を超えた
 			break;
-		if (hh4r->errorCode != 0)
-			goto err1;
+		}
+		if (hh4r->errorCode != 0){
+			// hh4エラー
+			goto err_hh4_too_long_bit;
+		}
 		Int32 opecode = hh4GetUnsigned(hh4r);
 		int len = instrLengthSimple(opecode), i;
 		if (len > 0) {
-			if (dst + len > dst1)
-				goto err;
+			// すべてunsignedな引数
+			if (dst + len > dst1){
+				goto err_write_overrun;
+			}
 			*dst = opecode;
-			for (i = 1; i < len; i++)
+			for (i = 1; i < len; i++){
 				dst[i] = hh4GetUnsigned(hh4r);
+			}
 			dst += len;
+			// 次の命令へ
 			continue;
 		}
-		jitc->hh4dst = dst;
-		dst = hh4DecodeInteger(jitc, opecode);
-		if (dst != jitc->hh4dst) continue; // 何か処理できたようなので次へ.
-		dst = hh4DecodePointer(jitc, opecode);
-		if (dst != jitc->hh4dst) continue;
-		dst = hh4DecodeFloat(jitc, opecode);
-		if (dst != jitc->hh4dst) continue;
-		dst = hh4DecodeExtend(jitc, opecode);
-		if (dst != jitc->hh4dst) continue;
-
+		// 複雑な引数を持つ命令かも…instrTypesを確認
+		const char *instrTypes = NULL;
+		instrTypes = instrTypesInteger(jitc, opecode);
+		if(instrTypes) goto read_args;
+		instrTypes = instrTypesFloat(jitc, opecode);
+		if(instrTypes) goto read_args;
+		
+internal_error:
+		// どうやら命令番号ではないみたい
 		fprintf(stderr, "Error: hh4Decode: opecode=0x%02X\n", opecode); // 内部エラー.
 		exit(1);
+		
+read_args:
+		// 複雑な引数を持つ命令を読み込む
+		*dst = opecode;
+		dst++;
+		for(; *instrTypes != '\0'; instrTypes++){
+			if(dst >= dst1){
+				// 1バイト共通チェック
+				goto err_write_overrun;
+			}
+			if(*instrTypes == 'u'){
+				dst[0] = hh4GetUnsigned(hh4r);
+				dst++;
+			} else if(*instrTypes == 's'){
+				dst[0] = hh4GetSigned(hh4r);
+				dst++;
+			} else if(*instrTypes == 'f'){
+				dst[0] = hh4Get4Nbit(hh4r, 32 / 4);
+				dst++;
+			} else if(*instrTypes == 'd'){
+				if(dst + 2 > dst1){
+					// 2バイトチェック
+					goto err_write_overrun;
+				}
+				dst[0] = hh4Get4Nbit(hh4r, 32 / 4);
+				dst[1] = hh4Get4Nbit(hh4r, 32 / 4); 
+				dst += 2;
+			} else{
+				// 存在しない引数タイプなので内部エラー
+				goto internal_error;
+			}
+		}
+		// 次の命令へ...
 	}
 	return dst;
-err:
+err_write_overrun:
 	jitc->errorCode = JITC_HH4_DST_OVERRUN;
 	return dst;
-err1:
+err_hh4_too_long_bit:
 	jitc->errorCode = JITC_HH4_BITLENGTH_OVER;
 	return dst;
 }

--- a/integer.c
+++ b/integer.c
@@ -25,39 +25,12 @@ int instrLengthInteger(const Int32 *src, const Int32 *src1)
 	return retcode;
 }
 
-Int32 *hh4DecodeInteger(OsecpuJitc *jitc, Int32 opecode)
-// instrLengthSimpleInitTool()で登録していないものだけに反応すればよい.
+const char *instrTypesInteger(OsecpuJitc *jitc, Int32 opecode)
 {
-	HH4Reader *hh4r = jitc->hh4r;
-	Int32 *dst = jitc->hh4dst, *dst1 = jitc->hh4dst1;
-	int i, v;
-	if (opecode == 0x02) {
-		if (dst + 4 > dst1)
-			goto err;
-		*dst = opecode;
-		dst[1] = hh4GetSigned(hh4r);
-		dst[2] = hh4GetUnsigned(hh4r);
-		dst[3] = hh4GetUnsigned(hh4r);
-		dst += 4;
-		goto fin;
-	}
-	if (opecode == 0xfd) {
-		if (dst + 3 > dst1)
-			goto err;
-		*dst = opecode;
-		dst[1] = v = hh4GetUnsigned(hh4r);
-		dst[2] = i = hh4GetUnsigned(hh4r);
-		if (0 <= i && i <= 3)
-			jitc->dr[i] = v;
-		dst += 3;
-		goto fin;
-	}
-fin:
-	jitc->dst = dst;
-	return dst;
-err:
-	jitc->errorCode = JITC_HH4_DST_OVERRUN;
-	return dst;
+	char *retstr = NULL;
+	if (opecode == 0x02) retstr = "suu";
+	if (opecode == 0xfd) retstr = "uu";
+	return retstr;
 }
 
 int jitcStepInteger(OsecpuJitc *jitc)

--- a/osecpu-vm.h
+++ b/osecpu-vm.h
@@ -108,28 +108,28 @@ unsigned char *hh4StrToBin(char *src, char *src1, unsigned char *dst, unsigned c
 // integer.c : 整数命令
 void osecpuInitInteger();
 int instrLengthInteger(const Int32 *src, const Int32 *src1);
-Int32 *hh4DecodeInteger(OsecpuJitc *jitc, Int32 opecode);
+const char *instrTypesInteger(OsecpuJitc *jitc, Int32 opecode);
 int jitcStepInteger(OsecpuJitc *jitc);
 void execStepInteger(OsecpuVm *vm);
 
 // pointer.c : ポインタ命令
 void osecpuInitPointer();
 int instrLengthPointer(const Int32 *src, const Int32 *src1);
-Int32 *hh4DecodePointer(OsecpuJitc *jitc, Int32 opecode);
+const char *instrTypesPointer(OsecpuJitc *jitc, Int32 opecode);
 int jitcStepPointer(OsecpuJitc *jitc);
 void execStepPointer(OsecpuVm *vm);
 
 // float.c : 浮動小数点命令
 void osecpuInitFloat();
 int instrLengthFloat(const Int32 *src, const Int32 *src1);
-Int32 *hh4DecodeFloat(OsecpuJitc *jitc, Int32 opecode);
+const char *instrTypesFloat(OsecpuJitc *jitc, Int32 opecode);
 int jitcStepFloat(OsecpuJitc *jitc);
 void execStepFloat(OsecpuVm *vm);
 
 // extend.c : 拡張命令関係.
 void osecpuInitExtend();
 int instrLengthExtend(const Int32 *src, const Int32 *src1);
-Int32 *hh4DecodeExtend(OsecpuJitc *jitc, Int32 opecode);
+const char *instrTypesExtend(OsecpuJitc *jitc, Int32 opecode);
 int jitcStepExtend(OsecpuJitc *jitc);
 void execStepExtend(OsecpuVm *vm);
 

--- a/pointer.c
+++ b/pointer.c
@@ -19,17 +19,11 @@ int instrLengthPointer(const Int32 *src, const Int32 *src1)
 	return retcode;
 }
 
-Int32 *hh4DecodePointer(OsecpuJitc *jitc, Int32 opecode)
-// instrLengthSimpleInitTool()で登録していないものだけに反応すればよい.
+const char *instrTypesPointer(OsecpuJitc *jitc, Int32 opecode)
 {
-	HH4Reader *hh4r = jitc->hh4r;
-	Int32 *dst = jitc->hh4dst, *dst1 = jitc->hh4dst1;
-fin:
-	jitc->dst = dst;
-	return dst;
-err:
-	jitc->errorCode = JITC_HH4_DST_OVERRUN;
-	return dst;
+	char *retstr = NULL;
+	
+	return retstr;
 }
 
 void jitcStep_checkPxx(int *pRC, int pxx)