Commit: 7f45df1bd32716f08f1392326b36dbe5bcd6254f - OSECPU_VM_2 (git)

Commit MetaInfo

• Revisión: 7f45df1bd32716f08f1392326b36dbe5bcd6254f (tree)
• Tiempo: 2014-05-14 20:06:38
• Autor: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

osecpu105a

Cambiar Resumen

• modified: float.c
• modified: memo.txt
• modified: osecpu-vm.c
• modified: osecpu-vm.h
• modified: pointer.c
• modified: test.c

Diferencia incremental

--- a/float.c
+++ b/float.c
@@ -23,7 +23,7 @@ void jitcStep_checkFxxNotF3F(int *pRC, int fxx)
 
 void jitcStep_checkBitsF(int *pRC, int bit)
 {
-	if (bit != 32 && bit != 64)
+	if (bit != 0 && bit != 32 && bit != 64)
 		jitcSetRetCode(pRC, JITC_BAD_BITS);
 	return;
 }
@@ -44,7 +44,9 @@ int jitcStepFloat(OsecpuJitc *jitc)
 			f = ip[3]; bit = ip[4];
 			jitcStep_checkBitsF(pRC, bit);
 			jitcStep_checkFxx(pRC, f);
-		} else if (ip[1] == 1) {
+			goto fin;
+		}
+		if (ip[1] == 1) {
 			ip[2] = hh4ReaderGet4Nbit(&jitc->hh4r, 32 / 4); // imm
 			ip[3] = hh4ReaderGetUnsigned(&jitc->hh4r); // f
 			ip[4] = hh4ReaderGetUnsigned(&jitc->hh4r); // bit
@@ -52,7 +54,9 @@ int jitcStepFloat(OsecpuJitc *jitc)
 			f = ip[3]; bit = ip[4];
 			jitcStep_checkBitsF(pRC, bit);
 			jitcStep_checkFxx(pRC, f);
-		} else if (ip[1] == 2) {
+			goto fin;
+		}
+		if (ip[1] == 2) {
 			ip[2] = hh4ReaderGet4Nbit(&jitc->hh4r, 32 / 4); // imm-high
 			ip[3] = hh4ReaderGet4Nbit(&jitc->hh4r, 32 / 4); // imm-low
 			ip[4] = hh4ReaderGetUnsigned(&jitc->hh4r); // f
@@ -61,8 +65,9 @@ int jitcStepFloat(OsecpuJitc *jitc)
 			f = ip[4]; bit = ip[5];
 			jitcStep_checkBitsF(pRC, bit);
 			jitcStep_checkFxx(pRC, f);
-		} else
-			jitcSetRetCode(pRC, JITC_BAD_FLIMM_MODE);
+			goto fin;
+		}
+		jitcSetRetCode(pRC, JITC_BAD_FLIMM_MODE);
 		goto fin;
 	}
 	if (opecode == 0x41) {	// FCP
@@ -205,18 +210,12 @@ void execStepFloat(OsecpuVm *vm)
 			jitcSetRetCode(&vm->errorCode, EXEC_BAD_BITS);
 			goto fin;
 		}
-		if (opecode == 0x48)
-			i = vm->f[f1] == vm->f[f2];
-		if (opecode == 0x49)
-			i = vm->f[f1] != vm->f[f2];
-		if (opecode == 0x4a)
-			i = vm->f[f1] <  vm->f[f2];
-		if (opecode == 0x4b)
-			i = vm->f[f1] >= vm->f[f2];
-		if (opecode == 0x4c)
-			i = vm->f[f1] <= vm->f[f2];
-		if (opecode == 0x4d)
-			i = vm->f[f1] >  vm->f[f2];
+		if (opecode == 0x48) i = vm->f[f1] == vm->f[f2];
+		if (opecode == 0x49) i = vm->f[f1] != vm->f[f2];
+		if (opecode == 0x4a) i = vm->f[f1] <  vm->f[f2];
+		if (opecode == 0x4b) i = vm->f[f1] >= vm->f[f2];
+		if (opecode == 0x4c) i = vm->f[f1] <= vm->f[f2];
+		if (opecode == 0x4d) i = vm->f[f1] >  vm->f[f2];
 		if (i != 0)
 			i = -1;
 		vm->r[r] = i;
@@ -230,14 +229,10 @@ void execStepFloat(OsecpuVm *vm)
 			jitcSetRetCode(&vm->errorCode, EXEC_BAD_BITS);
 			goto fin;
 		}
-		if (opecode == 0x50)
-			vm->f[f0] = vm->f[f1] + vm->f[f2];
-		if (opecode == 0x51)
-			vm->f[f0] = vm->f[f1] - vm->f[f2];
-		if (opecode == 0x52)
-			vm->f[f0] = vm->f[f1] * vm->f[f2];
-		if (opecode == 0x53)
-			vm->f[f0] = vm->f[f1] / vm->f[f2];
+		if (opecode == 0x50) vm->f[f0] = vm->f[f1] + vm->f[f2];
+		if (opecode == 0x51) vm->f[f0] = vm->f[f1] - vm->f[f2];
+		if (opecode == 0x52) vm->f[f0] = vm->f[f1] * vm->f[f2];
+		if (opecode == 0x53) vm->f[f0] = vm->f[f1] / vm->f[f2];
 		vm->bitF[f0] = bit;
 		ip += 5;
 		goto fin;

--- a/memo.txt
+++ b/memo.txt
@@ -1,3 +1,7 @@
+参考資料:
+  page0072 : バックエンド命令セットの仕様
+  page0078 : bitについての説明
+
 2014.05.01木:
   ソースはTAB=4想定で書いています
 
@@ -19,4 +23,8 @@
     0は「未設定」や「初期化済み」や「未使用」などを意味する
   gotoを結構よく使っているのは、インデントがむやみに深くなるのを避けるため。
 
+2014.05.08木:
+  OSECPU-VMではfloatの精度は32bitまでを保証する。
+  倍精度である64bitをサポートするかは処理系依存。
+  floatのサポートそのものがない場合も許す。
 

--- a/osecpu-vm.c
+++ b/osecpu-vm.c
@@ -109,6 +109,44 @@ Int32 hh4ReaderGet4Nbit(Hh4Reader *hh4r, int n)
 	return value;
 }
 
+// bitReader関係.
+
+void bitReaderInit(BitReader *br, Hh4Reader *hh4r)
+{
+	br->hh4r = hh4r;
+	br->bitBuf = 0;
+	br->bufLen = 0;
+	return;
+}
+
+int bitReaderGet(BitReader *br)
+{
+	int b;
+	if (br->bufLen <= 0) {
+		br->bitBuf = hh4ReaderGet4bit(br->hh4r);
+		br->bufLen = 4;
+	}
+	br->bufLen--;
+	b = (br->bitBuf >> br->bufLen) & 1;
+	return b;
+}
+
+int bitReaderGetNbitUnsigned(BitReader *br, int n)
+{
+	int i, value = 0;
+	for (i = 0; i < n; i++)
+		value = value << 1 | bitReaderGet(br);
+	return value;
+}
+
+int bitReaderGetNbitSigned(BitReader *br, int n)
+{
+	int value = bitReaderGetNbitUnsigned(br, n);
+	if (n <= 31 && ((value >> (n - 1)) & 1) != 0)
+		value |= -1 << n;
+	return value;
+}
+
 // jitc関係.
 
 void jitcInitDstLogSetPhase(OsecpuJitc *jitc, int phase)
@@ -176,6 +214,7 @@ int jitcAll(OsecpuJitc *jitc)
 {
 	Hh4ReaderPointer src0 = jitc->hh4r.p;
 	Int32 *dst0 = jitc->dst;
+	definesInit(jitc->defines);
 	jitcInitDstLogSetPhase(jitc, 0);
 	for (;;) {
 		// 理想は適当な上限を決めて、休み休みでやるべきかもしれない.
@@ -224,10 +263,10 @@ int execStep(OsecpuVm *vm)
 {
 	const Int32 *ip = vm->ip;
 	vm->errorCode = 0;
-	execStepInteger(vm);	if (ip != vm->ip) goto fin;
-	execStepPointer(vm);	if (ip != vm->ip) goto fin;
-	execStepFloat(vm);		if (ip != vm->ip) goto fin;
-	execStepExtend(vm);		if (ip != vm->ip) goto fin;
+	execStepInteger(vm);	if (ip != vm->ip || vm->errorCode != 0) goto fin;
+	execStepPointer(vm);	if (ip != vm->ip || vm->errorCode != 0) goto fin;
+	execStepFloat(vm);		if (ip != vm->ip || vm->errorCode != 0) goto fin;
+	execStepExtend(vm);		if (ip != vm->ip || vm->errorCode != 0) goto fin;
 	if (*ip == -1) {
 		vm->errorCode = EXEC_ABORT_OPECODE_M1; // デバッグ用.
 		goto fin;

--- a/osecpu-vm.h
+++ b/osecpu-vm.h
@@ -30,6 +30,11 @@ typedef struct _Hh4Reader {
 	int length, errorCode;
 } Hh4Reader;
 
+typedef struct _BitReader {
+	Hh4Reader *hh4r;
+	int bitBuf, bufLen;
+} BitReader;
+
 #define JITC_DSTLOG_SIZE	16
 
 typedef struct _OsecpuJitc {
@@ -68,6 +73,11 @@ Int32 hh4ReaderGetUnsigned(Hh4Reader *hh4r);
 Int32 hh4ReaderGetSigned(Hh4Reader *hh4r);
 Int32 hh4ReaderGet4Nbit(Hh4Reader *hh4r, int n);
 
+void bitReaderInit(BitReader *br, Hh4Reader *hh4r);
+int bitReaderGet(BitReader *br);
+int bitReaderGetNbitUnsigned(BitReader *br, int n);
+int bitReaderGetNbitSigned(BitReader *br, int n);
+
 void jitcInitDstLogSetPhase(OsecpuJitc *jitc, int phase);
 void jitcSetRetCode(int *pRC, int value);
 void jitcSetHh4BufferSimple(OsecpuJitc *jitc, int length);
@@ -89,6 +99,7 @@ int jitcAll(OsecpuJitc *jitc);
 #define JITC_LABEL_REDEFINED	13
 #define JITC_BAD_LABEL_TYPE		14
 #define JITC_LABEL_UNDEFINED	15
+#define JITC_BAD_TYPE			16
 
 void jitcStep_checkBits32(int *pRC, int bits);
 void jitcStep_checkRxx(int *pRC, int rxx);

--- a/pointer.c
+++ b/pointer.c
@@ -14,12 +14,27 @@ void jitcStep_checkPxx(int *pRC, int pxx)
 	return;
 }
 
+void getTypSize(int typ, int *typSize0, int *typSize1, int *typSign)
+{
+	*typSize0 = *typSize1 = -1;
+	if (2 <= typ && typ <= 21) {
+		static unsigned char table[10] = { 8, 16, 32, 4, 2, 1, 12, 20, 24, 28 };
+		if ((typ & 1) == 0)
+			*typSign = -1; // typが偶数なら符号あり.
+		else
+			*typSign = 0; // typが奇数なら符号なし.
+		*typSize0 = table[(typ - 2) / 2];
+		*typSize1 = (*typSize0 + 7) / 8;
+	}
+	return;
+}
+
 int jitcStepPointer(OsecpuJitc *jitc)
 {
 	Int32 *ip = jitc->hh4Buffer;
 	Int32 opecode = ip[0], imm;
 	int retcode = -1, *pRC = &retcode;
-	int i, opt, p;
+	int i, j, opt, p, typ, len, typSign, typSize0, typSize1;
 	if (opecode == 0x01) { /* LB(opt, uimm); */
 		jitcSetHh4BufferSimple(jitc, 3);
 		i = ip[1]; opt = ip[2];
@@ -58,6 +73,70 @@ int jitcStepPointer(OsecpuJitc *jitc)
 			jitcSetRetCode(pRC, JITC_BAD_LABEL_TYPE); // P3Fにデータラベルを代入できない.
 		goto fin;
 	}
+	if (opecode == 0x2e) { // data
+		BitReader br;
+		typ = hh4ReaderGetUnsigned(&jitc->hh4r);
+		len = hh4ReaderGetUnsigned(&jitc->hh4r);
+		getTypSize(typ, &typSize0, &typSize1, &typSign);
+		if (typSize0 < 0) {
+			jitcSetRetCode(pRC, JITC_BAD_TYPE);
+			goto fin;
+		}
+		jitc->instrLength = 0; // 自前で処理するので、この値は0にする.
+		if (jitc->dst + 3 + (typSize1 * len + 3) / 4 > jitc->dst1) {
+			jitcSetRetCode(pRC, JITC_DST_OVERRUN);
+			goto fin;
+		}
+		ip = jitc->dst;
+		ip[0] = 0x2e;
+		ip[1] = typ;
+		ip[2] = len;
+		jitc->dst += 3;
+		if (typ != 1) {
+			bitReaderInit(&br, &jitc->hh4r);
+			// 以下は構造体サポートに配慮できてない.
+			if (typSize1 == 1 && typSign == 0) {
+				unsigned char *puc = (unsigned char *) jitc->dst;
+				for (i = 0; i < len; i++)
+					puc[i] = bitReaderGetNbitUnsigned(&br, typSize0);
+			}
+			if (typSize1 == 1 && typSign != 0) {
+				signed char *psc = (signed char *) jitc->dst;
+				for (i = 0; i < len; i++)
+					psc[i] = bitReaderGetNbitSigned(&br, typSize0);
+			}
+			if (typSize1 == 2 && typSign == 0) {
+				unsigned short *pus = (unsigned short *) jitc->dst;
+				for (i = 0; i < len; i++)
+					pus[i] = bitReaderGetNbitUnsigned(&br, typSize0);
+			}
+			if (typSize1 == 2 && typSign != 0) {
+				signed short *pss = (signed short *) jitc->dst;
+				for (i = 0; i < len; i++)
+					pss[i] = bitReaderGetNbitSigned(&br, typSize0);
+			}
+			if (typSize1 == 4 && typSign == 0) {
+				unsigned int *pui = (unsigned int *) jitc->dst;
+				for (i = 0; i < len; i++)
+					pui[i] = bitReaderGetNbitUnsigned(&br, typSize0);
+			}
+			if (typSize1 == 4 && typSign != 0) {
+				signed int *psi = (signed int *) jitc->dst;
+				for (i = 0; i < len; i++)
+					psi[i] = bitReaderGetNbitSigned(&br, typSize0);
+			}
+			jitc->dst += (typSize1 * len + 3) / 4;
+			jitc->dst += (len + 3) / 4;
+		}
+		for (j = 0; j < JITC_DSTLOG_SIZE; j++) {
+			Int32 *dstLog = jitc->dstLog[jitc->dstLogIndex + JITC_DSTLOG_SIZE - 1 - j];
+			if (dstLog == NULL) break;
+			if (dstLog[0] != 0x01) break;
+			i = dstLog[1];
+			jitc->defines->label[i].typ = typ;
+			jitc->defines->label[i].dst = ip;
+		}
+	}
 	goto fin1;
 fin:
 	if (retcode == -1)
@@ -75,7 +154,7 @@ void execStepPointer(OsecpuVm *vm)
 {
 	const Int32 *ip = vm->ip;
 	Int32 opecode = ip[0];
-	int i, p;
+	int i, p, typ, len, typSign, typSize0, typSize1;
 	if (opecode == 0x01) { /* LB(opt, uimm); */
 		ip += 3;
 		goto fin;
@@ -88,6 +167,12 @@ void execStepPointer(OsecpuVm *vm)
 			ip += 3;
 		goto fin;
 	}
+	if (opecode == 0x2e) {	// data
+		typ = ip[1]; len = ip[2];
+		getTypSize(typ, &typSize0, &typSize1, &typSign);
+		ip += 3 + (typSize1 * len + 3) / 4;
+		goto fin;
+	}
 fin:
 	vm->ip = ip;
 	return;

--- a/test.c
+++ b/test.c
@@ -1,13 +1,14 @@
 #include "osecpu-vm.h"
 
+#define BUFFER_SIZE		256
+
 int main(int argc, const char **argv)
 {
 	Defines defs;
 	OsecpuJitc jitc;
 	OsecpuVm vm;
-	unsigned char hh4src[256], *hh4src1;
-	Int32 i32buf[256], j32buf[256];
-	definesInit(&defs);
+	unsigned char hh4src[BUFFER_SIZE], *hh4src1;
+	Int32 i32buf[BUFFER_SIZE], j32buf[BUFFER_SIZE];
 	jitc.defines = &defs;
 	vm.defines = &defs;
 
@@ -45,19 +46,23 @@ int main(int argc, const char **argv)
 		"c40 0 767fffff bf c40"			// FLIMM64(F3F, 0x7fffff);
 		"c49 5 bf c40 bf a0"			// FCMPNE32_64(R3F, F05, F3F);
 		"4 bf"							// CND(R3F);
-		"3 1 bf",						// PLIMM(P3F, 1);
-		NULL, hh4src, &hh4src[256]
+		"3 1 bf"						// PLIMM(P3F, 1);
+
+		"2 0 3 0"						// LIMM0(R03, 0);
+		"90 3 3 3 a0",					// CP32(R03, R03); // ここでエラーコード1になる.
+		NULL, hh4src, &hh4src[BUFFER_SIZE]
 	);
 
 	if (hh4src1 == NULL) {
 		printf("hh4src1 == NULL\n");
 		return 1;
 	}
+	printf("hh4src1 - hh4src = %d\n", hh4src1 - hh4src);
 
 	// jitcAll()を使って、hh4src[]内のプログラムをj32buf[]に変換する.
-	hh4ReaderInit(&jitc.hh4r, hh4src, 0, hh4src1, 1);
+	hh4ReaderInit(&jitc.hh4r, hh4src, 0, hh4src1, 0);
 	jitc.dst  =  j32buf;
-	jitc.dst1 = &j32buf[256];
+	jitc.dst1 = &j32buf[BUFFER_SIZE];
 	printf("jitcAll()=%d\n", jitcAll(&jitc)); // 0なら成功.
 	*jitc.dst = -1; // デバッグ用の特殊opecode.
 	vm.ip  = j32buf;