OSDN Git Service

JITCのソース整理
authorhikarupsp <hikarupsp@users.sourceforge.jp>
Sun, 16 Mar 2014 07:23:48 +0000 (16:23 +0900)
committerhikarupsp <hikarupsp@users.sourceforge.jp>
Sun, 16 Mar 2014 07:23:48 +0000 (16:23 +0900)
jitc.h
jitcx86.c
jitcx86a.c
main.c
osecpu.h

diff --git a/jitc.h b/jitc.h
index b45308d..59e3360 100644 (file)
--- a/jitc.h
+++ b/jitc.h
@@ -61,6 +61,8 @@ int jitCompCmdLen(const unsigned char *src);
 //\r
 #define envOffset_DBGINFO0             (2304 + 0)\r
 #define envOffset_DBGINFO1             (2304 + 4)\r
+#define envOffset_PTRCTRL       (2320)\r
+#define PRegOffset(regid)       (256 + 32 * regid)\r
 //\r
 #define jitCompPutImm32(p, i)                                  jitCompPutByte4(p, ((i) & 0xff), (((i) >> 8) & 0xff), (((i) >> 16) & 0xff), (((i) >> 24) & 0xff))\r
 //\r
@@ -72,7 +74,9 @@ int jitCompCmdLen(const unsigned char *src);
 #define jitCompPutOp_PUSH_GReg(p, reg)                 jitCompPutByte1(p, 0x50 | (reg));\r
 #define jitCompPutOp_PUSH_Imm8(p, i)                           jitCompPutByte2(p, 0x6a, i);\r
 #define jitCompPutOp_POP_GReg(p, reg)                  jitCompPutByte1(p, 0x58 | (reg));\r
-#define jitCompPutOp_CALL_Relative(p, diff)            jitCompPutByte1(p, 0xe8); jitCompPutImm32(p, j);\r
+#define jitCompPutOp_CALL_Relative(p, diff)            jitCompPutByte1(p, 0xe8); jitCompPutImm32(p, diff); /*次の命令との相対オフセットだけ相対コールする*/\r
+#define jitCompPutOp_JMPnear(p, diff)                  jitCompPutByte1(p, 0xe9); jitCompPutImm32(p, diff); /*次の命令との相対オフセットだけ相対ジャンプする*/\r
+#define jitCompPutOp_JMPshort(p, diff)                 jitCompPutByte2(p, 0xeb, diff & 0xff);/*次の命令との相対オフセットだけ相対ジャンプする*/\r
 //\r
 #define jitCompPutOp_MOV_EAX_ZERO(p)                           jitCompPutOp_XOR_GReg_GReg(p, IA32_REG0_EAX, IA32_REG0_EAX);\r
 \r
@@ -86,7 +90,7 @@ int jitCompCmdLen(const unsigned char *src);
 #define        jitCompA0001_OPTIMIZE_JMP               1*1\r
 #define        jitCompA0001_OPTIMIZE_MOV               1*1     /* 1にすると速度低下する? */\r
 #define        jitCompA0001_OPTIMIZE_CMP               1*1\r
-#define        jitCompA0001_OPTIMIZE_ALIGN             4*1     /* 0-8を想定 */\r
+#define        jitCompA0001_OPTIMIZE_ALIGN             8       /* 0-8を想定 */\r
 #define        jitCompA0001_EBP128                             128*1\r
 \r
 struct JitCompWork {\r
index b916500..f9a4ee5 100644 (file)
--- a/jitcx86.c
+++ b/jitcx86.c
@@ -23,6 +23,7 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
        const unsigned char *oldsrc;\r
        int timecount = 0, i, j = 0, lastlabel = -1, debugInfo0 = -1;\r
        int reg0, reg1, reg2, cmp0reg = -1, cmp0lev = 0;\r
+       \r
        w.dst = w.dst0 = dst;\r
        w.err = 0;\r
        w.maxLabels = maxLabels;\r
@@ -77,14 +78,12 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                //\r
                                if (enter0 == NULL && (src[6] == 0x3c /* 多数のレジスタをスタックに退避 */ || (src[6] == 0xfe/* REMARK */ && src[7] == 0x01 && src[9] == 0x3c))) {       //beginFunc()中のLB\r
                                        // LB命令の後に0x3C命令・・・beginFunc()\r
-                                       jitCompPutByte1(w.dst, 0xe9);   // (x86) JMP rel32 : 次の命令との相対オフセットだけ相対ニアジャンプする\r
-                                       enter0 = w.dst;\r
-                                       jitCompPutImm32(w.dst, 0);      // 飛び相対座標が0 ・・・パイプラインのフラッシュ??\r
+                                       enter0 = w.dst + 1;\r
+                                       jitCompPutOp_JMPnear(w.dst, 0);\r
                                }\r
                                if (src[6] == 0x34) {\r
                                        // LBの次の命令がDATA ・・・DAT_SA0(label, typ32, length) ・・・メモリ確保命令\r
                                        tmp_ucp = w.dst;\r
-                                       jitCompPutByte1(w.dst, 0xe9);   // (x86) JMP rel32 : 次の命令との相対オフセットだけ相対ニアジャンプする\r
                                        i = jitCompGetImm32(&src[7]);   // type32 を取得\r
                                        j = 32;\r
                                        if (i != 1) {\r
@@ -106,19 +105,27 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                                }\r
                                        }\r
                                        j *= jitCompGetImm32(&src[11]);\r
-                                       if (j <= 0) w.err = JITC_ERR_BADTYPE;\r
-                                       jitCompPutImm32(w.dst, j);\r
+                                       if (j <= 0){\r
+                                               w.err = JITC_ERR_BADTYPE;\r
+                                       }\r
+                                       jitCompPutOp_JMPnear(w.dst, j);\r
 #if (jitCompA0001_OPTIMIZE_JMP != 0)\r
                                        if (j <= 127 - jitCompA0001_OPTIMIZE_ALIGN) {\r
+                                               // 今書いたのはなかったことにして、\r
                                                w.dst -= 5;\r
-                                               jitCompPutByte2(w.dst, 0xeb, j);\r
+                                               // よりサイズの小さな書き方にする\r
+                                               jitCompPutOp_JMPshort(w.dst, j);\r
                                        }\r
 #endif\r
                                }\r
 #if (jitCompA0001_OPTIMIZE_ALIGN != 0)\r
+                               // アラインを jitCompA0001_OPTIMIZE_ALIGNにそろえる\r
                                for (;;) {\r
                                        i = ((int)w.dst) & (jitCompA0001_OPTIMIZE_ALIGN - 1); /* ALIGNで割ったあまりを計算 */\r
-                                       if (i == 0) break;\r
+                                       if (i == 0){\r
+                                               // Already alligned.\r
+                                               break;\r
+                                       }\r
                                        i = jitCompA0001_OPTIMIZE_ALIGN - i;\r
                                        if (i == 1) { jitCompPutByte1(w.dst, 0x90); j += i; } /* NOP(); */\r
                                        if (i == 2) { jitCompPutByte2(w.dst, 0x89, 0xc0); j += i; } /* MOV(EAX, EAX); */\r
@@ -263,8 +270,7 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                                        j += 3;\r
                                                        w.dst -= 5;\r
                                                        jitCompPutByte1(w.dst, 0xeb); /* JMP(?); */\r
-                                               }\r
-                                               else {\r
+                                               } else {\r
                                                        j += 4;\r
                                                        w.dst -= 6;\r
                                                        jitCompPutByte1(w.dst, w.dst[1] ^ 0xf0);\r
@@ -273,28 +279,25 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        }\r
 #endif\r
                                } else {        // プログラムカウンタ以外への代入\r
-                                       \r
                                        // 代入先が P01, P02なら ESI, EDI,それ以外ならEAXを指定\r
                                        reg0 = jitCompA000_selectPRegCache(src[1], IA32_REG0_EAX);\r
-                                       jitCompPutByte1(w.dst, 0xb8 | reg0);    /* MOV(reg0, ?); */\r
-                                       jitCompPutImm32(w.dst, (int)label[i].p);        // ラベルのパスを各レジスタに代入\r
-                                       \r
-                                       // レジスタへの代入をメモリでエミュレーションする場合は、スタックに積む。\r
-                                       if (reg0 == 0)\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                                       // ラベルのパスを各レジスタに代入\r
+                                       jitCompPutOp_MOV_GReg_Imm32(w.dst, reg0, (int)label[i].p);\r
+                                       // レジスタへの代入をメモリでエミュレーションする場合は、スタックに書き込む。\r
+                                       if (reg0 == 0){\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 0, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                                       }\r
                                        \r
                                        if (level < JITC_LV_FASTEST) {\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 8, reg0); /* MOV([EBP+?], reg0); */ /* p0 */\r
-                                               jitCompPutByte1(w.dst, 0xb8); /* MOV(EAX, ?); */\r
-                                               jitCompPutImm32(w.dst, label[i].typ);\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 4, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */ /* typ */\r
-                                               jitCompPutByte1(w.dst, 0xb8); /* MOV(EAX, ?); */\r
-                                               jitCompPutImm32(w.dst, (int)label[i].p1);\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 12, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */ /* p1 */\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 8, reg0);                                /* p0 */\r
+                                               jitCompPutOp_MOV_GReg_Imm32(w.dst, IA32_REG0_EAX, label[i].typ);\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 4, IA32_REG0_EAX);       /* typ */\r
+                                               jitCompPutOp_MOV_GReg_Imm32(w.dst, IA32_REG0_EAX, (int)label[i].p1);\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 12, IA32_REG0_EAX);  /* p1 */\r
                                                jitCompPutOp_MOV_EAX_ZERO(w.dst);\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 16, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */ /* liveSign */\r
-                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, 0, 2320); /* MOV(EAX, ptrCtrl); */\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 20, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */ /* pls */\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 16, IA32_REG0_EAX);      /* liveSign */\r
+                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, envOffset_PTRCTRL);\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 20, IA32_REG0_EAX);      /* pls */\r
                                        }\r
                                }\r
                                break;\r
@@ -313,19 +316,22 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                reg0 = jitCompA000_selectRegCache(src[1], -1 /* mem */);\r
                                \r
                                /* TEST命令を発行 */\r
-                               if (reg0 < 0) { //比較対象のレジスタはメモリ上にある\r
-                                       jitCompPutByte1(w.dst, 0xf7); /* TEST([EBP+?],1); */\r
+                               if (reg0 < 0) {\r
+                                       // 比較対象のレジスタはメモリ上にある\r
+                                       jitCompPutByte1(w.dst, 0xf7); /* TEST = 1111 011w : mod 000 r/m : immediate data */\r
                                        jitCompPutModRM_Disp_BaseEBP(&w, src[1] * 4, 0);\r
-                               }\r
-                               else {\r
-                                       jitCompPutByte2(w.dst, 0xf7, 0xc0 | reg0); /* TEST(reg0,1); */\r
+                               } else {\r
+                                       // 比較対象はキャッシュレジスタ上にある\r
+                                       jitCompPutByte2(w.dst, 0xf7, 0xc0 | reg0); /* TEST = 1111 011w : 11 000 reg : immediate data */\r
                                }\r
                                jitCompPutImm32(w.dst, 1);\r
                                \r
                                /* JZ命令を発行 */\r
                                jitCompPutByte2(w.dst, 0x74, 0x00);     /* JZ($+2) */\r
                                cmp0reg = -1;\r
-                               if (w.err != 0) goto err_w;\r
+                               if (w.err != 0){\r
+                                       goto err_w;\r
+                               }\r
                                src += 2;\r
                                w.prefix = 1;   // プリフィックスをセット\r
                                w.dst0 = w.dst;\r
@@ -333,21 +339,27 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                \r
                        case 0x08: /* LMEM */   /* 完成 */\r
                                i = jitCompGetImm32(src + 2);\r
-                               if (i == 0x0001) w.err = JITC_ERR_BADTYPE;\r
+                               if (i == 0x0001){\r
+                                       w.err = JITC_ERR_BADTYPE;\r
+                               }\r
                                if (level < JITC_LV_FASTER) {\r
                                        jitCompA0001_checkType(&w, src[6], i, 0); // read\r
                                        cmp0reg = -1;\r
                                }\r
                                reg0 = jitCompA000_selectRegCache(src[1], IA32_REG0_EAX);\r
                                reg1 = jitCompA000_selectPRegCache(src[6], IA32_REG2_EDX);\r
-                               if (reg0 != IA32_REG0_EAX && reg1 == IA32_REG2_EDX)\r
+                               if (reg0 != IA32_REG0_EAX && reg1 == IA32_REG2_EDX){\r
                                        reg1 = IA32_REG0_EAX;\r
-                               if (reg1 == IA32_REG2_EDX)\r
+                               }\r
+                               if (reg1 == IA32_REG2_EDX){\r
                                        jitCompA000_storeRegCacheEdx(&w);\r
-                               if (reg1 <= 3 /* EAX, EDX */)\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, 256 + src[6] * 32 + 0); /* MOV(reg1, [EBP+?]); */\r
-                               if (level < JITC_LV_FASTER)\r
+                               }\r
+                               if (reg1 <= 3 /* EAX, EDX */){\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, PRegOffset(src[6]));\r
+                               }\r
+                               if (level < JITC_LV_FASTER){\r
                                        jitCompA0001_checkLimit(&w, reg1, src[6]);\r
+                               }\r
                                i = jitCompA000_convTyp(jitCompGetImm32(src + 2));\r
                                switch (i) {\r
                                        case 0x0002:\r
@@ -369,31 +381,40 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        default:\r
                                                w.err = JITC_ERR_BADTYPE;\r
                                }\r
-                               if (reg0 == 0 /* EAX */)\r
+                               if (reg0 == IA32_REG0_EAX){\r
                                        jitCompA0001_movRxxEax(&w, src[1]);\r
-                               if (reg1 == 2 /* EDX */)\r
+                               }\r
+                               if (reg1 == IA32_REG2_EDX){\r
                                        jitCompA000_loadRegCacheEdx(&w);\r
+                               }\r
                                break;\r
                                \r
                        case 0x09: /* SMEM */   /* 完成 */\r
                                i = jitCompGetImm32(src + 2);\r
-                               if (i == 0x0001) w.err = JITC_ERR_BADTYPE;\r
+                               if (i == 0x0001){\r
+                                       w.err = JITC_ERR_BADTYPE;\r
+                               }\r
                                if (level < JITC_LV_FASTER) {\r
                                        jitCompA0001_checkType(&w, src[6], i, 1); // write\r
                                        cmp0reg = -1;\r
                                }\r
                                reg0 = jitCompA000_selectRegCache(src[1], IA32_REG0_EAX);\r
                                reg1 = jitCompA000_selectPRegCache(src[6], IA32_REG2_EDX);\r
-                               if (reg0 != IA32_REG0_EAX && reg1 == IA32_REG2_EDX)\r
+                               if (reg0 != IA32_REG0_EAX && reg1 == IA32_REG2_EDX){\r
                                        reg1 = IA32_REG0_EAX;\r
-                               if (reg1 == IA32_REG2_EDX)\r
+                               }\r
+                               if (reg1 == IA32_REG2_EDX){\r
                                        jitCompA000_storeRegCacheEdx(&w);\r
-                               if (reg1 <= 3 /* EAX, EDX */)\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, 256 + src[6] * 32 + 0); /* MOV(reg1, [EBP+?]); */\r
-                               if (level < JITC_LV_FASTER)\r
+                               }\r
+                               if (reg1 <= 3 /* EAX, EDX */){\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, PRegOffset(src[6]) + 0); /* MOV(reg1, [EBP+?]); */\r
+                               }\r
+                               if (level < JITC_LV_FASTER){\r
                                        jitCompA0001_checkLimit(&w, reg1, src[6]);\r
-                               if (reg0 == 0 /* EAX */)\r
+                               }\r
+                               if (reg0 == IA32_REG0_EAX){\r
                                        jitCompA0001_movEaxRxx(&w, src[1]);\r
+                               }\r
                                /* 値の範囲チェック */\r
                                i = jitCompA000_convTyp(jitCompGetImm32(src + 2));\r
                                switch (i) {\r
@@ -412,13 +433,16 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        default:\r
                                                w.err = JITC_ERR_BADTYPE;\r
                                }\r
-                               if (reg1 == IA32_REG2_EDX)\r
+                               if (reg1 == IA32_REG2_EDX){\r
                                        jitCompA000_loadRegCacheEdx(&w);\r
+                               }\r
                                break;\r
                                \r
                        case 0x0a: /* PLMEM */  /* 完成 */\r
                                i = jitCompGetImm32(src + 2);\r
-                               if (i != 0x0001) w.err = JITC_ERR_BADTYPE;\r
+                               if (i != 0x0001){\r
+                                       w.err = JITC_ERR_BADTYPE;\r
+                               }\r
                                if (level < JITC_LV_FASTER) {\r
                                        jitCompA0001_checkType(&w, src[6], i, 0); // read\r
                                        cmp0reg = -1;\r
@@ -432,21 +456,26 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        jitCompA000_storePRegCacheAll(&w);\r
                                        reg1 = IA32_REG2_EDX;\r
                                }\r
-                               if (reg1 == IA32_REG2_EDX)\r
+                               if (reg1 == IA32_REG2_EDX){\r
                                        jitCompA000_storeRegCacheEdx(&w);\r
-                               if (reg1 <= 3 /* EAX, EDX */)\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, 256 + src[6] * 32 + 0); /* MOV(reg1, [EBP+?]); */\r
-                               if (level < JITC_LV_FASTER)\r
+                               }\r
+                               if (reg1 <= 3 /* EAX, EDX */){\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, PRegOffset(src[6])); /* MOV(reg1, [EBP+?]); */\r
+                               }\r
+                               if (level < JITC_LV_FASTER){\r
                                        jitCompA0001_checkLimit(&w, reg1, src[6]);\r
+                               }\r
                                jitCompPutByte2(w.dst, 0x8b, reg0 << 3 | reg1); /* MOV(reg0, [reg1]); */\r
-                               if (reg0 == IA32_REG0_EAX)\r
-                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 0, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                               if (reg0 == IA32_REG0_EAX){\r
+                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]), IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                               }\r
                                for (i = 4; i < 32; i += 4) {\r
                                        jitCompPutByte3(w.dst, 0x8b, 0x40 | reg1, i);   /* MOV(EAX, [reg1+?]); */\r
-                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
                                }\r
-                               if (reg1 == IA32_REG2_EDX)\r
+                               if (reg1 == IA32_REG2_EDX){\r
                                        jitCompA000_loadRegCacheEdx(&w);\r
+                               }\r
                                break;\r
                                \r
                        case 0x0b: /* PSMEM */  /* 完成 */\r
@@ -461,17 +490,21 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                /* これをやってはいけない!(by K, 2013.08.02) */\r
                                //      if (reg0 != 0 /* EAX */ && reg1 == 2 /* EDX */)\r
                                //              reg1 = 0; /* EAX */\r
-                               if (reg1 == IA32_REG2_EDX)\r
+                               if (reg1 == IA32_REG2_EDX){\r
                                        jitCompA000_storeRegCacheEdx(&w);\r
-                               if (reg1 <= 3 /* EAX, EDX */)\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, 256 + src[6] * 32 + 0); /* MOV(reg1, [EBP+?]); */\r
-                               if (level < JITC_LV_FASTER)\r
+                               }\r
+                               if (reg1 <= 3 /* EAX, EDX */){\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg1, PRegOffset(src[6])); /* MOV(reg1, [EBP+?]); */\r
+                               }\r
+                               if (level < JITC_LV_FASTER){\r
                                        jitCompA0001_checkLimit(&w, reg1, src[6]);\r
-                               if (reg0 == IA32_REG0_EAX)\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, 256 + src[1] * 32 + 0); /* MOV(reg0, [EBP+?]); */\r
+                               }\r
+                               if (reg0 == IA32_REG0_EAX){\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, PRegOffset(src[1])); /* MOV(reg0, [EBP+?]); */\r
+                               }\r
                                jitCompPutByte2(w.dst, 0x89, reg0 << 3 | reg1); /* MOV([reg1], reg0); */\r
                                for (i = 4; i < 32; i += 4) {\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, 256 + src[1] * 32 + i); /* MOV(EAX, [EBP+?]); */\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[1]) + i); /* MOV(EAX, [EBP+?]); */\r
                                        jitCompPutByte3(w.dst, 0x89, 0x40 | reg1, i);   /* MOV([reg1+?], EAX); */\r
                                }\r
                                if (reg1 == IA32_REG2_EDX)\r
@@ -485,61 +518,76 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                }\r
                                reg0 = jitCompA000_selectPRegCache(src[1], IA32_REG0_EAX);\r
                                reg1 = jitCompA000_selectPRegCache(src[6], -1 /* mem */);\r
-                               if (reg1 < 0 /* mem */)\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, 256 + src[6] * 32 + 0); /* MOV(reg0, [EBP+?]); */\r
+                               if (reg1 < 0 /* mem */){\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, PRegOffset(src[6])); /* MOV(reg0, [EBP+?]); */\r
+                               }\r
                                if (reg1 >= 0 && reg0 != reg1) {\r
                                        jitCompPutByte2(w.dst, 0x89, 0xc0 | reg1 << 3 | reg0); /* MOV(reg0, reg1); */\r
                                }\r
                                i = jitCompGetImm32(src + 2);\r
                                j = -1;\r
-                               if (i == 1)\r
+                               if (i == 1){\r
                                        j = 5; /* 32 */\r
-                               else {\r
+                               else {\r
                                        i = jitCompA000_convTyp(i);\r
-                                       if (0x0002 <= i && i <= 0x0007)\r
+                                       if (0x0002 <= i && i <= 0x0007){\r
                                                j = (i - 0x0002) >> 1;\r
+                                       }\r
+                               }\r
+                               if (j < 0) {\r
+                                       w.err = JITC_ERR_BADTYPE;\r
+                                       goto err_w;\r
                                }\r
-                               if (j < 0) { w.err = JITC_ERR_BADTYPE; goto err_w; }\r
 #if (jitCompA0001_USE_R3F_IMM32 != 0)\r
                                if (src[7] == 0x3f) {\r
                                        j = w.r3f << j;\r
 #if (jitCompA0001_USE_R3F_IMM8 != 0)\r
                                        if (-0x80 <= j && j <= 0x7f) {\r
 #if (jitCompA0001_USE_R3F_INCDEC != 0)\r
-                                               if (j == 1) { jitCompPutByte1(w.dst, 0x40 | reg0); goto padd1; } /* INC */\r
-                                               if (j == -1) { jitCompPutByte1(w.dst, 0x48 | reg0); goto padd1; } /* DEC */\r
+                                               if (j == 1) {\r
+                                                        /* INC */\r
+                                                       jitCompPutByte1(w.dst, 0x40 | reg0);\r
+                                                       goto padd1;\r
+                                               }\r
+                                               if (j == -1) {\r
+                                                        /* DEC */\r
+                                                       jitCompPutByte1(w.dst, 0x48 | reg0);\r
+                                                       goto padd1;\r
+                                               }\r
 #endif\r
-                                               jitCompPutByte3(w.dst, 0x83, 0xc0 | reg0, j & 0xff);    /* ADD(reg0, im8); */\r
+                                               /* ADD(reg0, im8); */\r
+                                               jitCompPutByte3(w.dst, 0x83, 0xc0 | reg0, j & 0xff);\r
                                                goto padd1;\r
                                        }\r
 #endif\r
                                        if (reg0 == 0) {\r
                                                jitCompPutByte1(w.dst, 0x05);   /* ADD(reg0, ?); */\r
-                                       }\r
-                                       else {\r
+                                       } else {\r
                                                jitCompPutByte2(w.dst, 0x81, 0xc0 | reg0);      /* ADD(reg0, ?); */\r
                                        }\r
                                        jitCompPutImm32(w.dst, j);\r
                                        goto padd1;\r
                                }\r
 #endif\r
-                               if (src[7] >= 0x40) w.err = JITC_ERR_REGNUM;\r
+                               if (src[7] >= 0x40){\r
+                                       w.err = JITC_ERR_REGNUM;\r
+                               }\r
                                if (j == 0) {\r
                                        reg1 = jitCompA000_selectRegCache(src[7], -1 /* mem */);\r
                                        if (reg1 >= 0) {\r
                                                jitCompPutByte2(w.dst, 0x01, 0xc0 | reg1 << 3 | reg0);  /* ADD(reg0, reg1); */\r
-                                       }\r
-                                       else {\r
+                                       } else {\r
                                                jitCompPutByte1(w.dst, 0x03);   /* ADD(reg0, [EBP+?]); */\r
                                                jitCompPutModRM_Disp_BaseEBP(&w, src[7] * 4, reg0);\r
                                        }\r
                                }\r
                                else {\r
                                        reg1 = jitCompA000_selectRegCache(src[7], -1 /* mem */);\r
-                                       reg2 = 2; /* EDX */\r
+                                       reg2 = IA32_REG2_EDX;\r
                                        jitCompA000_storeRegCacheEdx(&w);\r
-                                       if (reg1 < 0)\r
+                                       if (reg1 < 0){\r
                                                jitCompPutOp_MOV_GReg_EBPDisp(&w, reg2, src[7] * 4); /* MOV(reg2, [EBP+?]); */\r
+                                       }\r
                                        if (reg1 >= 0 && reg1 != reg2) {\r
                                                jitCompPutByte2(w.dst, 0x89, 0xc0 | reg1 << 3 | reg2); /* MOV(reg2, reg1); */\r
                                        }\r
@@ -550,12 +598,13 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
 #if (jitCompA0001_USE_R3F_IMM32 != 0)\r
                        padd1:\r
 #endif\r
-                               if (reg0 == IA32_REG0_EAX)\r
-                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 0, reg0); /* MOV([EBP+?], reg0); */\r
+                               if (reg0 == IA32_REG0_EAX){\r
+                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]), reg0); /* MOV([EBP+?], reg0); */\r
+                               }\r
                                if (src[1] != src[6]) {\r
                                        for (i = 4; i < 32; i += 4) {\r
-                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, 256 + src[6] * 32 + i); /* MOV(EAX, [EBP+?]); */\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + i, 0 /* EAX */); /* MOV([EBP+?], EAX); */\r
+                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[6]) + i); /* MOV(EAX, [EBP+?]); */\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
                                        }\r
                                }\r
                                cmp0reg = -1;\r
@@ -565,20 +614,26 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                reg0 = jitCompA000_selectRegCache(src[1], IA32_REG0_EAX);\r
                                jitCompA000_storePRegCacheAll(&w); // 手抜き.\r
                                jitCompA0001_checkCompPtr(&w, src[6], src[7]);\r
-                               jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, 256 + src[6] * 32 + 0); /* MOV(reg0, [EBP+?]); */\r
+                               jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, PRegOffset(src[6])); /* MOV(reg0, [EBP+?]); */\r
                                jitCompPutByte1(w.dst, 0x2b);   /* SUB(EAX, [EBP+?]); */\r
-                               jitCompPutModRM_Disp_BaseEBP(&w, 256 + src[7] * 32 + 0, reg0);\r
+                               jitCompPutModRM_Disp_BaseEBP(&w, PRegOffset(src[7]) + 0, reg0);\r
                                i = jitCompA000_convTyp(jitCompGetImm32(src + 2));\r
                                j = -1;\r
-                               if (0x0002 <= i && i <= 0x0007)\r
+                               if (0x0002 <= i && i <= 0x0007){\r
                                        j = (i - 0x0002) >> 1;\r
-                               if (j < 0) { w.err = JITC_ERR_BADTYPE; goto err_w; }\r
+                               }\r
+                               if (j < 0) {\r
+                                       w.err = JITC_ERR_BADTYPE;\r
+                                       goto err_w;\r
+                               }\r
                                if (j > 0) {\r
                                        jitCompPutByte3(w.dst, 0xc1, 0xf8 | reg0, j);   /* SAR(reg0,?); */\r
                                }\r
-                               if (reg0 == 0 /* EAX */)\r
+                               if (reg0 == IA32_REG0_EAX){\r
                                        jitCompA0001_movRxxEax(&w, src[1]);\r
-                               cmp0reg = src[1]; cmp0lev = 1;\r
+                               }\r
+                               cmp0reg = src[1];\r
+                               cmp0lev = 1;\r
                                break;\r
                                \r
                        case 0x10:      /* OR */\r
@@ -587,21 +642,27 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                        case 0x14:      /* ADD */\r
                        case 0x15:      /* SUB */\r
                        case 0x16:      /* MUL */\r
-                               if (src[1] >= 0x3f) w.err = JITC_ERR_REGNUM;\r
+                               if (src[1] >= 0x3f){\r
+                                       w.err = JITC_ERR_REGNUM;\r
+                               }\r
                                reg0 = jitCompA000_selectRegCache(src[1], IA32_REG0_EAX);\r
                                reg1 = jitCompA000_selectRegCache(src[2], -1 /* mem */);\r
 #if (jitCompA0001_USE_R3F_IMM32 != 0)\r
                                if (src[2] == 0x3f) {   // SUBのみ該当.\r
-                                       if (*src != 0x15) w.err = JITC_ERR_REGNUM;\r
+                                       if (*src != 0x15){\r
+                                               w.err = JITC_ERR_REGNUM;\r
+                                       }\r
                                        reg2 = jitCompA000_selectRegCache(src[3], -1 /* mem */);\r
-                                       if (reg2 >= 0)\r
+                                       if (reg2 >= 0){\r
                                                jitCompA000_storeRegCacheAll(&w);\r
+                                       }\r
                                        jitCompPutByte1(w.dst, 0xb8 | reg0);    /* MOV(reg0, ?); */\r
                                        jitCompPutImm32(w.dst, w.r3f);\r
                                        jitCompPutByte1(w.dst, 0x2b);\r
                                        jitCompPutModRM_Disp_BaseEBP(&w, src[3] * 4, reg0);\r
-                                       if (reg0 == 0)\r
+                                       if (reg0 == 0){\r
                                                jitCompA0001_movRxxEax(&w, src[1]);\r
+                                       }\r
                                        break;\r
                                }\r
 #endif\r
@@ -615,31 +676,36 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        // bugfix: hinted by Iris, 2013.06.26. thanks!\r
                                        cmp0reg = src[1];\r
                                        cmp0lev = 1;\r
-                                       if (src[0] < 0x14)\r
+                                       if (src[0] < 0x14){\r
                                                cmp0lev = 2;\r
-                                       if (src[0] == 0x16)\r
+                                       }\r
+                                       if (src[0] == 0x16){\r
                                                cmp0reg = -1;\r
+                                       }\r
                                }\r
                                if (!(src[0] == 0x10 && src[3] == 0xff)) {\r
 #if (jitCompA0001_USE_R3F_IMM32 != 0)\r
                                        if (src[3] == 0x3f) {\r
                                                if (*src == 0x16 && w.r3f == -1) {\r
                                                        jitCompPutByte2(w.dst, 0xf7, 0xd8 | reg0); /* NEG(reg0); */\r
-                                                       if (reg0 == 0)\r
+                                                       if (reg0 == 0){\r
                                                                jitCompA0001_movRxxEax(&w, src[1]);\r
+                                                       }\r
                                                        break;\r
                                                }\r
 #if (jitCompA0001_USE_R3F_INCDEC != 0)\r
                                                if ((*src == 0x14 && w.r3f == 1) || (*src == 0x15 && w.r3f == -1)) {\r
                                                        jitCompPutByte1(w.dst, 0x40 | reg0);    /* INC(reg0); */\r
-                                                       if (reg0 == 0)\r
+                                                       if (reg0 == 0){\r
                                                                jitCompA0001_movRxxEax(&w, src[1]);\r
+                                                       }\r
                                                        break;\r
                                                }\r
                                                if ((*src == 0x15 && w.r3f == 1) || (*src == 0x14 && w.r3f == -1)) {\r
                                                        jitCompPutByte1(w.dst, 0x48 | reg0);    /* DEC(reg0); */\r
-                                                       if (reg0 == 0)\r
+                                                       if (reg0 == 0){\r
                                                                jitCompA0001_movRxxEax(&w, src[1]);\r
+                                                       }\r
                                                        break;\r
                                                }\r
 #endif\r
@@ -648,21 +714,22 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                                        if (*src != 0x16) {\r
                                                                static unsigned char basic_op_table_im8[] = { 0xc8, 0xf0, 0xe0, 0, 0xc0, 0xe8 };\r
                                                                jitCompPutByte3(w.dst, 0x83, basic_op_table_im8[*src - 0x10] | reg0, w.r3f & 0xff);\r
-                                                       }\r
-                                                       else {\r
+                                                       } else{\r
                                                                jitCompPutByte3(w.dst, 0x6b, 0xc0 | reg0 << 3 | reg0, w.r3f & 0xff);\r
                                                        }\r
-                                                       if (reg0 == 0)\r
+                                                       if (reg0 == 0){\r
                                                                jitCompA0001_movRxxEax(&w, src[1]);\r
+                                                       }\r
                                                        break;\r
                                                }\r
 #endif\r
                                                if (reg0 == IA32_REG0_EAX) {\r
                                                        static unsigned char basic_op_table_im32_eax[] = { 0x0d, 0x35, 0x25, 0, 0x05, 0x2d, 0xc0 };\r
-                                                       if (*src == 0x16) { jitCompPutByte1(w.dst, 0x69); }\r
+                                                       if (*src == 0x16) {\r
+                                                               jitCompPutByte1(w.dst, 0x69);\r
+                                                       }\r
                                                        jitCompPutByte1(w.dst, basic_op_table_im32_eax[*src - 0x10]);\r
-                                               }\r
-                                               else {\r
+                                               } else{\r
                                                        if (*src != 0x16) {\r
                                                                static unsigned char basic_op_table_im32_reg[] = { 0xc8, 0xf0, 0xe0, 0, 0xc0, 0xe8 };\r
                                                                jitCompPutByte2(w.dst, 0x81, basic_op_table_im32_reg[*src - 0x10] | reg0);\r
@@ -672,58 +739,72 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                                        }\r
                                                }\r
                                                jitCompPutImm32(w.dst, w.r3f);\r
-                                               if (reg0 == 0)\r
+                                               if (reg0 == 0){\r
                                                        jitCompA0001_movRxxEax(&w, src[1]);\r
+                                               }\r
                                                break;\r
                                        }\r
 #endif\r
                                        reg1 = jitCompA000_selectRegCache(src[3], -1 /* mem */);\r
-                                       if (src[3] >= 0x40) w.err = JITC_ERR_REGNUM;\r
+                                       if (src[3] >= 0x40){\r
+                                               w.err = JITC_ERR_REGNUM;\r
+                                       }\r
                                        if (*src != 0x16) {\r
                                                if (reg1 >= 0) {\r
                                                        static unsigned char basic_op_table_rr[] = { 0x09, 0x31, 0x21, 0, 0x01, 0x29 }; /* op(reg,reg); */\r
                                                        jitCompPutByte2(w.dst, basic_op_table_rr[*src - 0x10], 0xc0 | reg1 << 3 | reg0);\r
-                                               }\r
-                                               else {\r
+                                               } else{\r
                                                        static unsigned char basic_op_table_rm[] = { 0x0b, 0x33, 0x23, 0, 0x03, 0x2b, 0xaf }; /* op(reg,mem); */\r
                                                        jitCompPutByte1(w.dst, basic_op_table_rm[*src - 0x10]);\r
                                                        jitCompPutModRM_Disp_BaseEBP(&w, src[3] * 4, reg0);\r
                                                }\r
-                                       }\r
-                                       else {\r
+                                       } else{\r
                                                if (reg1 >= 0) {\r
                                                        jitCompPutByte3(w.dst, 0x0f, 0xaf, 0xc0 | reg0 << 3 | reg1);\r
-                                               }\r
-                                               else {\r
+                                               } else{\r
                                                        jitCompPutByte2(w.dst, 0x0f, 0xaf);\r
                                                        jitCompPutModRM_Disp_BaseEBP(&w, src[3] * 4, reg0);\r
                                                }\r
                                        }\r
                                }\r
-                               if (reg0 == 0)\r
+                               if (reg0 == 0){\r
                                        jitCompA0001_movRxxEax(&w, src[1]);\r
+                               }\r
                                break;\r
                                \r
                        case 0x18:      /* SHL */\r
                        case 0x19:      /* SAR */\r
-                               if (src[1] >= 0x3f) w.err = JITC_ERR_REGNUM;\r
-                               if (src[3] >= 0x40) w.err = JITC_ERR_REGNUM;\r
+                               if (src[1] >= 0x3f){\r
+                                       w.err = JITC_ERR_REGNUM;\r
+                               }\r
+                               if (src[3] >= 0x40){\r
+                                       w.err = JITC_ERR_REGNUM;\r
+                               }\r
 #if (jitCompA0001_USE_R3F_IMM32 != 0)\r
                                if (src[3] == 0x3f) {\r
                                        reg0 = jitCompA000_selectRegCache(src[1], IA32_REG0_EAX);\r
                                        reg1 = jitCompA000_selectRegCache(src[2], -1 /* mem */);\r
-                                       if (src[1] >= 0x3f) w.err = JITC_ERR_REGNUM;\r
-                                       if (reg1 == -1)\r
+                                       if (src[1] >= 0x3f){\r
+                                               w.err = JITC_ERR_REGNUM;\r
+                                       }\r
+                                       if (reg1 == -1){\r
                                                jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, src[2] * 4); /* MOV(reg1, [EBP+?]); */\r
-                                       else {\r
+                                       } else{\r
                                                if (reg0 != reg1) {\r
                                                        jitCompPutByte2(w.dst, 0x89, 0xc0 | reg1 << 3 | reg0); /* MOV(reg0, reg1); */\r
                                                }\r
                                        }\r
-                                       if (*src == 0x18) { jitCompPutByte3(w.dst, 0xc1, 0xe0 | reg0, w.r3f); } /* SHL(reg0, im8); */\r
-                                       if (*src == 0x19) { jitCompPutByte3(w.dst, 0xc1, 0xf8 | reg0, w.r3f); } /* SAR(reg0, im8); */\r
-                                       if (reg0 == IA32_REG0_EAX)\r
+                                       if (*src == 0x18) {\r
+                                               /* SHL(reg0, im8); */\r
+                                               jitCompPutByte3(w.dst, 0xc1, 0xe0 | reg0, w.r3f);\r
+                                       }\r
+                                       if (*src == 0x19) {\r
+                                               /* SAR(reg0, im8); */\r
+                                               jitCompPutByte3(w.dst, 0xc1, 0xf8 | reg0, w.r3f);\r
+                                       }\r
+                                       if (reg0 == IA32_REG0_EAX){\r
                                                jitCompA0001_movRxxEax(&w, src[1]);\r
+                                       }\r
                                        cmp0reg = src[1];\r
                                        cmp0lev = 1;\r
                                        break;\r
@@ -735,15 +816,20 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                if (src[2] == 0x3f) {\r
                                        jitCompPutByte1(w.dst, 0xb8);   /* MOV(EAX, ?); */\r
                                        jitCompPutImm32(w.dst, w.r3f);\r
-                               }\r
-                               else {\r
+                               } else{\r
                                        jitCompA0001_movEaxRxx(&w, src[2]);\r
                                }\r
 #else\r
                                jitCompA0001_movEaxRxx(&w, src[2]);\r
 #endif\r
-                               if (*src == 0x18) { jitCompPutByte2(w.dst, 0xd3, 0xe0); } /* SHL(EAX, CL); */\r
-                               if (*src == 0x19) { jitCompPutByte2(w.dst, 0xd3, 0xf8); } /* SAR(EAX, CL); */\r
+                               if (*src == 0x18) {\r
+                                        /* SHL(EAX, CL); */\r
+                                       jitCompPutByte2(w.dst, 0xd3, 0xe0);\r
+                               }\r
+                               if (*src == 0x19) {\r
+                                       /* SAR(EAX, CL); */\r
+                                       jitCompPutByte2(w.dst, 0xd3, 0xf8);\r
+                               }\r
                                jitCompA0001_movRxxEax(&w, src[1]);\r
                                jitCompA000_loadRegCacheAll(&w); // 手抜き.\r
                                cmp0reg = src[1];\r
@@ -752,23 +838,21 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                \r
                        case 0x1a:      /* DIV */\r
                        case 0x1b:      /* MOD */\r
-                               if (src[1] >= 0x3f) w.err = JITC_ERR_REGNUM;\r
-                               if (src[2] >= 0x40) w.err = JITC_ERR_REGNUM;\r
-                               if (src[3] >= 0x40) w.err = JITC_ERR_REGNUM;\r
+                               if (src[1] >= 0x3f || src[2] >= 0x40 || src[3] >= 0x40){\r
+                                       w.err = JITC_ERR_REGNUM;\r
+                               }\r
                                jitCompA000_storeRegCacheAll(&w); // 手抜き.\r
 #if (jitCompA0001_USE_R3F_IMM32 != 0)\r
                                if (src[3] == 0x3f) {\r
                                        jitCompPutByte1(w.dst, 0xb8 | 1);       /* MOV(ECX, ?); */\r
                                        jitCompPutImm32(w.dst, w.r3f);\r
-                               }\r
-                               else {\r
+                               } else{\r
                                        jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG1_ECX, src[3] * 4); /* MOV(ECX, [EBP+?]); */\r
                                }\r
                                if (src[2] == 0x3f) {\r
                                        jitCompPutByte1(w.dst, 0xb8 | 0);       /* MOV(EAX, ?); */\r
                                        jitCompPutImm32(w.dst, w.r3f);\r
-                               }\r
-                               else {\r
+                               } else{\r
                                        jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, src[2] * 4); /* MOV(EAX, [EBP+?]); */\r
                                }\r
 #else\r
@@ -778,15 +862,21 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                jitCompPutByte1(w.dst, 0x99);   /* CDQ(); */\r
                                /* ECXがゼロではないことを確認すべき */\r
                                jitCompPutByte2(w.dst, 0xf7, 0xf9);     /* IDIV(ECX); */\r
-                               if (*src == 0x1a) { jitCompPutOp_MOV_EBPDisp_GReg(&w, src[1] * 4, IA32_REG0_EAX); }\r
-                               if (*src == 0x1b) { jitCompPutOp_MOV_EBPDisp_GReg(&w, src[1] * 4, IA32_REG2_EDX); }\r
+                               if (*src == 0x1a) {\r
+                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, src[1] * 4, IA32_REG0_EAX);\r
+                               }\r
+                               if (*src == 0x1b) {\r
+                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, src[1] * 4, IA32_REG2_EDX);\r
+                               }\r
                                jitCompA000_loadRegCacheAll(&w); // 手抜き.\r
                                cmp0reg = -1;\r
                                break;\r
                                \r
                        case 0x1c:      /* PLMT0 */\r
                        case 0x1d:      /* PLMT1 */\r
-                               if (src[1] >= 0x40 || src[2] >= 0x40) w.err = JITC_ERR_PREGNUM;\r
+                               if (src[1] >= 0x40 || src[2] >= 0x40){\r
+                                       w.err = JITC_ERR_PREGNUM;\r
+                               }\r
                                if (level < JITC_LV_FASTEST) {\r
                                        cmp0reg = -1;\r
                                        if (level < JITC_LV_FASTER) {\r
@@ -800,20 +890,23 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                }\r
                                \r
                        case 0x1e: /* PCP */            /* 未完成(p1まで完成) */\r
-                               if (src[1] >= 0x40 || src[2] >= 0x40) w.err = JITC_ERR_PREGNUM;\r
-                               if (src[2] == 0x3f) w.err = JITC_ERR_PREGNUM;\r
+                               if (src[1] >= 0x40 || src[2] >= 0x40){\r
+                                       w.err = JITC_ERR_PREGNUM;\r
+                               }\r
+                               if (src[2] == 0x3f){\r
+                                       w.err = JITC_ERR_PREGNUM;\r
+                               }\r
                                if (src[1] != 0x3f) {\r
                                        /* src[2] == 0xff の場合に対応できてない */\r
                                        jitCompA000_storePRegCacheAll(&w); // 手抜き.\r
                                        for (i = 0; i < 32; i += 4) {\r
-                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, 256 + src[2] * 32 + i); /* MOV(EAX, [EBP+?]); */\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[2]) + i); /* MOV(EAX, [EBP+?]); */\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
                                        }\r
                                        jitCompA000_loadPRegCacheAll(&w); // 手抜き.\r
-                               }\r
-                               else {\r
+                               } else {\r
                                        if (level < JITC_LV_FASTER) {\r
-                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, 0 /* EAX */, 256 + src[2] * 32 + 4); /* MOV(EAX, [EBP+?]); */ /* typ */\r
+                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[2]) + 4); /* MOV(EAX, [EBP+?]); */      /* typ */\r
                                                jitCompPutByte3(w.dst, 0x83, 0xf8, 0);  /* CMP(EAX, 0); */\r
                                                jitCompPutByte2(w.dst, 0x0f, 0x85); /* JNE */\r
                                                jitCompPutImm32(w.dst, errfnc - (w.dst + 4));\r
@@ -821,10 +914,10 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        }\r
                                        reg0 = IA32_REG0_EAX;\r
                                        jitCompA000_storePRegCacheAll(&w); // 手抜き.\r
-                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, 256 + src[2] * 32 + 0); /* MOV(EAX, [EBP+?]); */\r
+                                       jitCompPutOp_MOV_GReg_EBPDisp(&w, reg0, PRegOffset(src[2]) + 0); /* MOV(EAX, [EBP+?]); */\r
                                        if (level < JITC_LV_FASTER) {\r
                                                jitCompPutByte1(w.dst, 0x3b);   /* CMP(reg0, [EBP+?]); */\r
-                                               jitCompPutModRM_Disp_BaseEBP(&w, 256 + src[2] * 32 + 8, reg0);  /* p0 */\r
+                                               jitCompPutModRM_Disp_BaseEBP(&w, PRegOffset(src[2]) + 8, reg0); /* p0 */\r
                                                jitCompPutByte2(w.dst, 0x0f, 0x85); /* JNE */\r
                                                jitCompPutImm32(w.dst, errfnc - (w.dst + 4));\r
                                        }\r
@@ -834,20 +927,20 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                \r
                        case 0x1f: /* PCST */\r
                                if (jitCompGetImm32(src + 2) == 0) {\r
-                                       if (level < JITC_LV_FASTER)\r
+                                       if (level < JITC_LV_FASTER){\r
                                                jitCompA0001_checkType0(&w, src[6], jitCompGetImm32(src + 7), 2);\r
+                                       }\r
                                        jitCompA000_storePRegCacheAll(&w); // 手抜き.\r
                                        for (i = 0; i < 32 - 4; i += 4) {\r
-                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, 256 + src[6] * 32 + i); /* MOV(EAX, [EBP+?]); */\r
+                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[6]) + i); /* MOV(EAX, [EBP+?]); */\r
                                                if (i == 4) {\r
                                                        jitCompPutByte1(w.dst, 0x0d); /* OR(EAX, ?); */\r
                                                        jitCompPutImm32(w.dst, 0x80000000);\r
                                                }\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
                                        }\r
-                                       jitCompPutByte1(w.dst, 0xb8);   /* MOV(EAX, ?); */\r
-                                       jitCompPutImm32(w.dst, debugInfo1);\r
-                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 28, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                                       jitCompPutOp_MOV_GReg_Imm32(w.dst, IA32_REG0_EAX, debugInfo1);\r
+                                       jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 28, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
                                        jitCompA000_loadPRegCacheAll(&w); // 手抜き.\r
                                        cmp0reg = -1;\r
                                        break;\r
@@ -855,20 +948,20 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                if (jitCompGetImm32(src + 7) == 0) {\r
                                        jitCompA000_storePRegCacheAll(&w); // 手抜き.\r
                                        for (i = 0; i < 32 - 4; i += 4) {\r
-                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, 0 /* EAX */, 256 + src[6] * 32 + i); /* MOV(EAX, [EBP+?]); */\r
+                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[6]) + i); /* MOV(EAX, [EBP+?]); */\r
                                                if (i == 4) {\r
                                                        jitCompPutByte1(w.dst, 0x25); /* AND(EAX, ?); */\r
                                                        jitCompPutImm32(w.dst, 0x7fffffff);\r
                                                }\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + i, IA32_REG0_EAX); /* MOV([EBP+?], EAX); */\r
                                        }\r
                                        if (level < JITC_LV_FASTER) {\r
-                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, 256 + src[6] * 32 + 28); /* MOV(EAX, [EBP+?]); */\r
+                                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[6]) + 28); /* MOV(EAX, [EBP+?]); */\r
                                                jitCompPutByte1(w.dst, 0x3d);   /* CMP(EAX, ?); */\r
                                                jitCompPutImm32(w.dst, debugInfo1);\r
                                                jitCompPutByte2(w.dst, 0x74, 8); /* JE */\r
-                                               jitCompPutByte2(w.dst, 0x31, 0xc0);     /* XOR(EAX, EAX); (2) */\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 256 + src[1] * 32 + 0, IA32_REG0_EAX); /* MOV([EBP+?], EAX); (1+1+4) */\r
+                                               jitCompPutOp_MOV_EAX_ZERO(w.dst);\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, PRegOffset(src[1]) + 0, IA32_REG0_EAX); /* MOV([EBP+?], EAX); (1+1+4) */\r
                                        }\r
                                        jitCompA000_loadPRegCacheAll(&w); // 手抜き.\r
                                        cmp0reg = -1;\r
@@ -889,9 +982,13 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                reg1 = jitCompA000_selectRegCache(src[3], -1 /* mem */);\r
                                if (src[1] == 0x3f) {\r
                                        /* 特殊構文チェック */\r
-                                       if (w.prefix != 0) { w.err = JITC_ERR_PREFIX; goto err_w; }\r
+                                       if (w.prefix != 0) {\r
+                                               w.err = JITC_ERR_PREFIX;\r
+                                               goto err_w;\r
+                                       }\r
                                        if (src[4] != 0x04 || src[5] != 0x3f || src[6] != 0x03 || src[7] != 0x3f) {\r
-                                               w.err = JITC_ERR_IDIOM; goto err_w;\r
+                                               w.err = JITC_ERR_IDIOM;\r
+                                               goto err_w;\r
                                        }\r
                                }\r
                                if (reg0 == 0)\r
@@ -902,10 +999,12 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        if ((*src <= 0x25 && w.r3f == 0) || (*src >= 0x26 && w.r3f == -1)) {\r
                                                i = 0;\r
                                                if (cmp0reg == src[2]) {\r
-                                                       if (cmp0lev >= 1 && (src[0] == 0x20 || src[0] == 0x21 || src[0] == 0x26 || src[0] == 0x27))\r
+                                                       if (cmp0lev >= 1 && (src[0] == 0x20 || src[0] == 0x21 || src[0] == 0x26 || src[0] == 0x27)){\r
                                                                i = 1;\r
-                                                       if (cmp0lev >= 2 && (src[0] == 0x22 || src[0] == 0x23 || src[0] == 0x24 || src[0] == 0x25))\r
+                                                       }\r
+                                                       if (cmp0lev >= 2 && (src[0] == 0x22 || src[0] == 0x23 || src[0] == 0x24 || src[0] == 0x25)){\r
                                                                i = 1;\r
+                                                       }\r
                                                }\r
                                                if (i == 0) {\r
                                                        jitCompPutByte2(w.dst, 0x85, 0xc0 | reg0 << 3 | reg0);  /* TEST(reg0, reg0); */\r
@@ -922,29 +1021,48 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        }\r
 #endif\r
                                        if (reg0 == 0) {\r
-                                               if (*src <= 0x25) { jitCompPutByte1(w.dst, 0x3d); }\r
-                                               if (*src >= 0x26) { jitCompPutByte1(w.dst, 0xa9); }\r
+                                               if (*src <= 0x25) {\r
+                                                       jitCompPutByte1(w.dst, 0x3d);\r
+                                               }\r
+                                               if (*src >= 0x26) {\r
+                                                       jitCompPutByte1(w.dst, 0xa9);\r
+                                               }\r
                                        }\r
                                        else {\r
-                                               if (*src <= 0x25) { jitCompPutByte2(w.dst, 0x81, 0xf8 | reg0); }\r
-                                               if (*src >= 0x26) { jitCompPutByte2(w.dst, 0xf7, 0xc0 | reg0); }\r
+                                               if (*src <= 0x25) {\r
+                                                       jitCompPutByte2(w.dst, 0x81, 0xf8 | reg0);\r
+                                               }\r
+                                               if (*src >= 0x26) {\r
+                                                       jitCompPutByte2(w.dst, 0xf7, 0xc0 | reg0);\r
+                                               }\r
                                        }\r
                                        jitCompPutImm32(w.dst, w.r3f);\r
                                        goto cmpcc1;\r
                                }\r
 #endif\r
-                               if (src[3] >= 0x40) w.err = JITC_ERR_PREGNUM;\r
-                               if (reg1 >= 0) {\r
-                                       if (*src <= 0x25) { jitCompPutByte2(w.dst, 0x39, 0xc0 | reg1 << 3 | reg0); }\r
-                                       if (*src >= 0x26) { jitCompPutByte2(w.dst, 0x85, 0xc0 | reg1 << 3 | reg0); }\r
+                               if (src[3] >= 0x40){\r
+                                       w.err = JITC_ERR_PREGNUM;\r
                                }\r
-                               else {\r
-                                       if (*src <= 0x25) { jitCompPutByte1(w.dst, 0x3b); }\r
-                                       if (*src >= 0x26) { jitCompPutByte1(w.dst, 0x85); }\r
+                               if (reg1 >= 0) {\r
+                                       if (*src <= 0x25) {\r
+                                               jitCompPutByte2(w.dst, 0x39, 0xc0 | reg1 << 3 | reg0);\r
+                                       }\r
+                                       if (*src >= 0x26) {\r
+                                               jitCompPutByte2(w.dst, 0x85, 0xc0 | reg1 << 3 | reg0);\r
+                                       }\r
+                               } else{\r
+                                       if (*src <= 0x25) {\r
+                                               jitCompPutByte1(w.dst, 0x3b);\r
+                                       }\r
+                                       if (*src >= 0x26) {\r
+                                               jitCompPutByte1(w.dst, 0x85);\r
+                                       }\r
                                        jitCompPutModRM_Disp_BaseEBP(&w, src[3] * 4, reg0);\r
                                }\r
                        cmpcc1:\r
-                               if (w.err != 0) goto err_w;\r
+                               if (w.err != 0){\r
+                                       goto err_w;\r
+                               }\r
                                static unsigned char cmpcc_table0[] = {\r
                                        0x04, 0x05, 0x0c, 0x0d, 0x0e, 0x0f, 0x04, 0x05, /* CMPcc, TSTcc */\r
                                        0x04, 0x05, 0x02, 0x03, 0x06, 0x07                              /* PCMPcc */\r
@@ -956,12 +1074,16 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        src += 6;\r
                                        i = jitCompGetLabelNum(&w, src + 2);\r
                                        if ((flags & JITC_PHASE1) != 0 && w.err != 0) {\r
-                                               if (label[i].opt == 0) { w.err = JITC_ERR_LABELNODEF; goto err_w; }\r
+                                               if (label[i].opt == 0) {\r
+                                                       w.err = JITC_ERR_LABELNODEF;\r
+                                                       goto err_w;\r
+                                               }\r
                                                //      if (label[i].typ != 1) { w.err = JITC_ERR_LABELTYP; goto err_w; }\r
                                        }\r
                                        j = 0;\r
-                                       if ((flags & JITC_PHASE1) != 0 || (((flags & JITC_PHASE1) == 0) && label[i].opt != 0))\r
+                                       if ((flags & JITC_PHASE1) != 0 || (((flags & JITC_PHASE1) == 0) && label[i].opt != 0)){\r
                                                j = label[i].p - (w.dst + 4);\r
+                                       }\r
                                        jitCompPutImm32(w.dst, j);\r
 #if (jitCompA0001_OPTIMIZE_JMP != 0)\r
                                        if (-128 - 4 <= j && j < 0) {\r
@@ -971,7 +1093,9 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                        }\r
 #endif\r
                                        src += 6;\r
-                                       if (w.err != 0) goto err_w;\r
+                                       if (w.err != 0){\r
+                                               goto err_w;\r
+                                       }\r
                                        continue;\r
                                }\r
 #endif\r
@@ -980,8 +1104,9 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                jitCompPutByte3(w.dst, 0x0f, 0x90 | cmpcc_table0[*src - 0x20], 0xc0 | reg0);    /* SETcc(BYTE(reg0)); */\r
                                jitCompPutByte3(w.dst, 0x0f, 0xb6, 0xc0 | reg0 << 3 | reg0);    /* MOVZX(reg0, BYTE(reg0)); */\r
                                jitCompPutByte2(w.dst, 0xf7, 0xd8 | reg0);      /* NEG(reg0); */\r
-                               if (reg0 == 0)\r
+                               if (reg0 == 0){\r
                                        jitCompA0001_movRxxEax(&w, src[1]);\r
+                               }\r
                                cmp0reg = src[2];\r
                                cmp0lev = 1;\r
                                break;\r
@@ -994,21 +1119,27 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                        case 0x2d:      /* PCMPG */\r
                                if (src[1] == 0x3f) {\r
                                        /* 特殊構文チェック */\r
-                                       if (w.prefix != 0) { w.err = JITC_ERR_PREFIX; goto err_w; }\r
+                                       if (w.prefix != 0) {\r
+                                               w.err = JITC_ERR_PREFIX;\r
+                                               goto err_w;\r
+                                       }\r
                                        if (src[4] != 0x04 || src[5] != 0x3f || src[6] != 0x03 || src[7] != 0x3f) {\r
-                                               w.err = JITC_ERR_IDIOM; goto err_w;\r
+                                               w.err = JITC_ERR_IDIOM;\r
+                                               goto err_w;\r
                                        }\r
                                }\r
-                               if (src[2] >= 0x40) w.err = JITC_ERR_PREGNUM;\r
+                               if (src[2] >= 0x40) {\r
+                                       w.err = JITC_ERR_PREGNUM;\r
+                               }\r
                                jitCompA000_storePRegCacheAll(&w); // 手抜き.\r
-                               if (src[3] != 0xff)\r
+                               if (src[3] != 0xff){\r
                                        jitCompA0001_checkCompPtr(&w, src[2], src[3]);\r
-                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, 256 + src[2] * 32 + 0); /* MOV(EAX, [EBP+?]); */\r
+                               }\r
+                               jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(src[2]) + 0); /* MOV(EAX, [EBP+?]); */\r
                                if (src[3] != 0xff) {\r
                                        jitCompPutByte1(w.dst, 0x3b);   /* CMP(EAX, [EBP+?]); */\r
-                                       jitCompPutModRM_Disp_BaseEBP(&w, 256 + src[3] * 32 + 0, 0);\r
-                               }\r
-                               else {\r
+                                       jitCompPutModRM_Disp_BaseEBP(&w, PRegOffset(src[3]) + 0, 0);\r
+                               } else{\r
                                        /* ヌルポインタとの比較はこれでいいのか?たぶんよくない */\r
                                        jitCompPutByte3(w.dst, 0x83, 0xf8, 0x00);       /* CMP(EAX, 0); */\r
                                }\r
@@ -1051,13 +1182,20 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                \r
                        case 0x34:      /* data (暫定) */\r
                                cmp0reg = -1;\r
-                               if (w.prefix != 0) { w.err = JITC_ERR_PREFIX; goto err_w; }\r
+                               if (w.prefix != 0) {\r
+                                       w.err = JITC_ERR_PREFIX;\r
+                                       goto err_w;\r
+                               }\r
                                int k = jitCompGetImm32(&src[1]), tmpData, bitCount, dataWidth = jitCompA000_dataWidth(k);\r
-                               if (lastlabel >= 0 && label[lastlabel].typ == 0)\r
+                               if (lastlabel >= 0 && label[lastlabel].typ == 0){\r
                                        label[lastlabel].typ = k;\r
+                               }\r
                                if (k != 1) {\r
                                        i = jitCompA000_convTyp(k);\r
-                                       if (i < 2 || i > 7) { w.err = JITC_ERR_BADTYPE; goto err_w; }\r
+                                       if (i < 2 || i > 7) {\r
+                                               w.err = JITC_ERR_BADTYPE;\r
+                                               goto err_w;\r
+                                       }\r
                                }\r
                                j = jitCompGetImm32(&src[5]);\r
                                oldsrc = src;\r
@@ -1065,8 +1203,16 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                if (k != 1) {\r
                                        bitCount = 7;\r
                                        while (j > 0) {\r
-                                               if (src >= src1) { w.err = JITC_ERR_SRC1; src = oldsrc; goto err_w; }\r
-                                               if (w.dst + 256 > dst1) { w.err = JITC_ERR_DST1; src = oldsrc; goto err_w; }\r
+                                               if (src >= src1) {\r
+                                                       w.err = JITC_ERR_SRC1;\r
+                                                       src = oldsrc;\r
+                                                       goto err_w;\r
+                                               }\r
+                                               if (w.dst + 256 > dst1) {\r
+                                                       w.err = JITC_ERR_DST1;\r
+                                                       src = oldsrc;\r
+                                                       goto err_w;\r
+                                               }\r
                                                tmpData = 0;\r
                                                for (k = 0; k < dataWidth; k++) {\r
                                                        tmpData = tmpData << 1 | ((*src >> bitCount) & 1);\r
@@ -1079,34 +1225,51 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                                if ((i & 1) == 0 && dataWidth <= 31 && (tmpData >> (dataWidth - 1)) != 0) {\r
                                                        tmpData -= 1 << dataWidth;\r
                                                }\r
-                                               if (i == 2 || i == 3) { jitCompPutByte1(w.dst, tmpData & 0xff); }\r
-                                               if (i == 4 || i == 5) { jitCompPutByte2(w.dst, tmpData & 0xff, (tmpData >> 8) & 0xff); }\r
-                                               if (i == 6 || i == 7) { jitCompPutByte4(w.dst, tmpData & 0xff, (tmpData >> 8) & 0xff, (tmpData >> 16) & 0xff, (tmpData >> 24) & 0xff); }\r
+                                               if (i == 2 || i == 3) {\r
+                                                       jitCompPutByte1(w.dst, tmpData & 0xff);\r
+                                               }\r
+                                               if (i == 4 || i == 5) {\r
+                                                       jitCompPutByte2(w.dst, tmpData & 0xff, (tmpData >> 8) & 0xff);\r
+                                               }\r
+                                               if (i == 6 || i == 7) {\r
+                                                       jitCompPutByte4(w.dst, tmpData & 0xff, (tmpData >> 8) & 0xff, (tmpData >> 16) & 0xff, (tmpData >> 24) & 0xff);\r
+                                               }\r
                                                j--;\r
                                        }\r
-                               }\r
-                               else {\r
+                               } else{\r
                                        while (j > 0) {\r
-                                               if (src >= src1) { w.err = JITC_ERR_SRC1; src = oldsrc; goto err_w; }\r
-                                               if (w.dst + 256 > dst1) { w.err = JITC_ERR_DST1; src = oldsrc; goto err_w; }\r
+                                               if (src >= src1) {\r
+                                                       w.err = JITC_ERR_SRC1;\r
+                                                       src = oldsrc;\r
+                                                       goto err_w;\r
+                                               }\r
+                                               if (w.dst + 256 > dst1) {\r
+                                                       w.err = JITC_ERR_DST1;\r
+                                                       src = oldsrc;\r
+                                                       goto err_w;\r
+                                               }\r
                                                i = jitCompGetImm32(src);\r
                                                src += 4;\r
                                                if ((flags & JITC_PHASE1) != 0 && w.err == 0) {\r
-                                                       if (label[i].opt == 0) { w.err = JITC_ERR_LABELNODEF; goto err_w; }\r
+                                                       if (label[i].opt == 0) {\r
+                                                               w.err = JITC_ERR_LABELNODEF;\r
+                                                               goto err_w;\r
+                                                       }\r
                                                }\r
                                                jitCompPutImm32(w.dst, (int)label[i].p);\r
                                                jitCompPutImm32(w.dst, label[i].typ);\r
                                                jitCompPutImm32(w.dst, (int)label[i].p);\r
                                                jitCompPutImm32(w.dst, (int)label[i].p1);\r
                                                jitCompPutImm32(w.dst, 0); /* liveSign */\r
-                                               jitCompPutImm32(w.dst, 2320); /* pls */\r
+                                               jitCompPutImm32(w.dst, envOffset_PTRCTRL); /* pls */\r
                                                jitCompPutImm32(w.dst, 0);\r
                                                jitCompPutImm32(w.dst, 0);\r
                                                j--;\r
                                        }\r
                                }\r
-                               if (lastlabel >= 0 && label[lastlabel].p1 < w.dst)\r
+                               if (lastlabel >= 0 && label[lastlabel].p1 < w.dst){\r
                                        label[lastlabel].p1 = w.dst;\r
+                               }\r
                                continue;\r
                                \r
                        case 0x3c:      /* ENTER */\r
@@ -1148,28 +1311,26 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                break;\r
                                \r
                        case 0xfe:      /* remark */\r
-                               if (src[1] == 0x01 && src[2] == 0x00) { // DBGINFO1\r
+                               if (src[1] == 0x01 && src[2] == 0x00) {\r
+                                       // DBGINFO1\r
                                        if (level <= JITC_LV_SLOWER) {\r
-                                               jitCompPutByte1(w.dst, 0xb8);   /* MOV(EAX, ?); */\r
-                                               jitCompPutImm32(w.dst, debugInfo1);\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 2304 + 4, IA32_REG0_EAX); /* MOV(debugInfo1, EAX); */\r
+                                               jitCompPutOp_MOV_GReg_Imm32(w.dst, IA32_REG0_EAX, debugInfo1);\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, envOffset_DBGINFO1, IA32_REG0_EAX);\r
                                        }\r
                                }\r
-                               if (src[1] == 0x01 && src[2] == 0x03) { // DBGINFO1CLR\r
+                               if (src[1] == 0x01 && src[2] == 0x03) {\r
+                                       // DBGINFO1CLR\r
                                        if (level <= JITC_LV_SLOWER) {\r
-                                               jitCompPutByte1(w.dst, 0xb8);   /* MOV(EAX, ?); */\r
-                                               jitCompPutImm32(w.dst, -1);\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 2304 + 4, IA32_REG0_EAX); /* MOV(debugInfo1, EAX); */\r
+                                               jitCompPutOp_MOV_GReg_Imm32(w.dst, IA32_REG0_EAX, -1);\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, envOffset_DBGINFO1, IA32_REG0_EAX);\r
                                        }\r
                                }\r
-                               if (src[1] == 0x05 && src[2] == 0x00) { // DBGINFO0\r
+                               if (src[1] == 0x05 && src[2] == 0x00) {\r
+                                       // DBGINFO0\r
                                        if (level <= JITC_LV_SLOWEST) {\r
                                                debugInfo0 = jitCompGetImm32(src + 3);\r
-                                               //      jitCompPutByte1(w.dst, 0xbf);   /* MOV(EDI, ?); */\r
-                                               //      jitCompPutImm32(&w, debugInfo0);\r
-                                               jitCompPutByte1(w.dst, 0xb8);   /* MOV(EAX, ?); */\r
-                                               jitCompPutImm32(w.dst, debugInfo0);\r
-                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, 2304 + 0, IA32_REG0_EAX); /* MOV(debugInfo0, EAX); */\r
+                                               jitCompPutOp_MOV_GReg_Imm32(w.dst, IA32_REG0_EAX, debugInfo0);\r
+                                               jitCompPutOp_MOV_EBPDisp_GReg(&w, envOffset_DBGINFO0, IA32_REG0_EAX);\r
                                        }\r
                                }\r
                                break;\r
@@ -1178,9 +1339,13 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
                                w.err = JITC_ERR_OPECODE;\r
                                goto err_w;\r
                }\r
-               if (w.err != 0) goto err_w;\r
+               if (w.err != 0){\r
+                       goto err_w;\r
+               }\r
                jitCompA0001_fixPrefix(&w);\r
-               if (w.err != 0) goto err_w;\r
+               if (w.err != 0) {\r
+                       goto err_w;\r
+               }\r
                src += jitCompCmdLen(src);\r
        }\r
        if (enter0 != NULL) {\r
@@ -1193,16 +1358,18 @@ int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *sr
        if ((flags & JITC_NOSTARTUP) == 0) {\r
                jitCompA000_storeRegCacheAll(&w);\r
                jitCompA000_storePRegCacheAll(&w);\r
-               jitCompPutByte1(w.dst, 0x61); /* POPAD(); */\r
+               jitCompPutOp_POPAD(w.dst);\r
        }\r
-       if ((flags & JITC_PHASE1) != 0)\r
+       if ((flags & JITC_PHASE1) != 0){\r
                return w.dst - dst00;\r
+       }\r
        return 0;\r
        \r
 err_w:\r
        if ((w.err & JITC_ERR_PHASE0ONLY) != 0) {\r
-               if ((flags & JITC_PHASE1) == 0)\r
+               if ((flags & JITC_PHASE1) == 0){\r
                        w.err &= ~JITC_ERR_PHASE0ONLY;\r
+               }\r
        }\r
        if (w.err == (JITC_ERR_MASK & JITC_ERR_REGNUM))                 errmsg = "reg-number error";\r
        if (w.err == (JITC_ERR_MASK & JITC_ERR_DST1))                   errmsg = "dst1 error";\r
@@ -1255,7 +1422,8 @@ unsigned char *jitCompCallFunc(unsigned char *dst, void *func)
        jitCompPutOp_POPAD(w.dst);\r
        jitCompA000_loadRegCacheAll(&w);\r
        jitCompA000_loadPRegCacheAll(&w);\r
-       jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, 256 + 0x30 * 32 + 0); /* MOV(EAX, [EBP+?]); */\r
+       jitCompPutOp_MOV_GReg_EBPDisp(&w, IA32_REG0_EAX, PRegOffset(0x30) + 0);\r
+       \r
        jitCompPutByte2(w.dst, 0xff, 0xe0);     /* JMP(EAX); */\r
        return w.dst;\r
 }\r
@@ -1271,21 +1439,32 @@ void func3c(char *ebp, int opt, int r1, int p1, int lenR, int lenP, int r0, int
        HOSECPU_RuntimeEnvironment *r = (HOSECPU_RuntimeEnvironment *) (ebp - jitCompA0001_EBP128);\r
        int i, *pi;\r
        HOSECPU_PointerRegisterEntry *pp;\r
-       if (r->junkStack + 2048 > r->junkStack1) (*(r->errHndl))(r);\r
-       pi = (void *)r->junkStack; r->junkStack += r1 * 4;\r
-       for (i = 0; i < r1; i++)\r
+       \r
+       if (r->junkStack + 2048 > r->junkStack1) {\r
+               (*(r->errHndl))(r);\r
+       }\r
+       pi = (void *)r->junkStack;\r
+       r->junkStack += r1 * 4;\r
+       for (i = 0; i < r1; i++){\r
                pi[i] = r->ireg[i];\r
-       pp = (void *)r->junkStack; r->junkStack += p1 * 32;\r
-       for (i = 0; i < p1; i++)\r
+       }\r
+       pp = (void *)r->junkStack;\r
+       r->junkStack += p1 * 32;\r
+       for (i = 0; i < p1; i++){\r
                pp[i] = r->preg[i];\r
-       pp = (void *)r->junkStack; r->junkStack += 32;\r
+       }\r
+       pp = (void *)r->junkStack;\r
+       r->junkStack += 32;\r
        *pp = r->preg[0x30];\r
-       pi = (void *)r->junkStack; r->junkStack += 4;\r
+       pi = (void *)r->junkStack;\r
+       r->junkStack += 4;\r
        *pi = opt << 16 | r1 << 8 | p1;\r
-       for (i = 0; i < lenR; i++)\r
+       for (i = 0; i < lenR; i++){\r
                r->ireg[r0 + i] = r->ireg[0x30 + i];\r
-       for (i = 0; i < lenP; i++)\r
+       }\r
+       for (i = 0; i < lenP; i++){\r
                r->preg[p0 + i] = r->preg[0x31 + i];\r
+       }\r
        return;\r
 }\r
 \r
@@ -1310,10 +1489,13 @@ void funcf4(char *ebp, int pxx, int typ, int len)
 {\r
        HOSECPU_RuntimeEnvironment *r = (HOSECPU_RuntimeEnvironment *) (ebp - jitCompA0001_EBP128);\r
        int width = jitCompA000_dataWidth(jitCompA000_convTyp(r->ireg[typ])) >> 3;\r
-       if (width < 0 || r->ireg[len] < 0)\r
+       if (width < 0 || r->ireg[len] < 0){\r
                (*(r->errHndl))(r);\r
+       }\r
        void *p = r->junkStack;\r
-       if (r->junkStack + width * r->ireg[len] + 256 > r->junkStack1) (*(r->errHndl))(r);\r
+       if (r->junkStack + width * r->ireg[len] + 256 > r->junkStack1){\r
+               (*(r->errHndl))(r);\r
+       }\r
        r->junkStack += width * r->ireg[len];\r
        r->preg[pxx].p = p;\r
        r->preg[pxx].typ = r->ireg[typ];\r
@@ -1325,8 +1507,9 @@ void funcf4(char *ebp, int pxx, int typ, int len)
        if (r->ireg[typ] == 1) {\r
                int i, i1 = (width * r->ireg[len]) >> 2;\r
                pi = p;\r
-               for (i = 0; i < i1; i++)\r
+               for (i = 0; i < i1; i++){\r
                        pi[i] = 0;\r
+               }\r
        }\r
        return;\r
 }\r
@@ -1350,8 +1533,9 @@ void funcf6(char *ebp, int pxx, int typ, int len)
 {\r
        HOSECPU_RuntimeEnvironment *r = (HOSECPU_RuntimeEnvironment *) (ebp - jitCompA0001_EBP128);\r
        int width = jitCompA000_dataWidth(jitCompA000_convTyp(r->ireg[typ])) >> 3;\r
-       if (width < 0 || r->ireg[len] < 0)\r
+       if (width < 0 || r->ireg[len] < 0){\r
                (*(r->errHndl))(r);\r
+       }\r
        void *p = malloc(width * r->ireg[len]);\r
        r->preg[pxx].p = p;\r
        r->preg[pxx].typ = r->ireg[typ];\r
@@ -1360,10 +1544,12 @@ void funcf6(char *ebp, int pxx, int typ, int len)
        if (r->ireg[typ] == 1) {\r
                int i, i1 = (width * r->ireg[len]) >> 2, *pi;\r
                pi = p;\r
-               for (i = 0; i < i1; i++)\r
+               for (i = 0; i < i1; i++){\r
                        pi[i] = 0;\r
-               for (i = 1; i < i1; i += 8)\r
+               }\r
+               for (i = 1; i < i1; i += 8){\r
                        pi[i] |= -1;\r
+               }\r
        }\r
        return;\r
 }\r
@@ -1405,6 +1591,7 @@ int jitc0(unsigned char **qq, unsigned char *q1, const unsigned char *p0, const
        }\r
        \r
        jitCompPutOp_PUSH_GReg(q, IA32_REG5_EBP);\r
+       \r
        *q++ = 0x8b; *q++ = 0x6c; *q++ = 0x24; *q++ = 0x08; /* MOV(EBP,[ESP+8]); */\r
        \r
        for (i = 0; i < JITC_MAXLABELS; i++){\r
@@ -1436,35 +1623,51 @@ int dbgrGetRegNum(const char *p)
        if (p[2] <= ' ') {\r
                i = p[0] - '0';\r
                j = p[1] - '0';\r
-               if (i > 9) i -= 'A' - '0' - 10;\r
-               if (j > 9) j -= 'A' - '0' - 10;\r
-               if (0 <= i && i <= 15 && 0 <= j && j <= 15)\r
+               if (i > 9){\r
+                       i -= 'A' - '0' - 10;\r
+               }\r
+               if (j > 9){\r
+                       j -= 'A' - '0' - 10;\r
+               }\r
+               if (0 <= i && i <= 15 && 0 <= j && j <= 15){\r
                        r = i << 4 | j;\r
+               }\r
        }\r
        return r;\r
 }\r
 \r
 void dbgrMain(HOSECPU_RuntimeEnvironment *r)\r
 {\r
-       if (r->dbgr == 0) return;\r
+       if (r->dbgr == 0){\r
+               return;\r
+       }\r
        for (;;) {\r
                char cmd[64], *p;\r
                int i, j, k;\r
+               \r
                printf("\ndbgr>");\r
                p = fgets(cmd, 64, stdin);\r
-               if (p == NULL) break;\r
-               if (cmd[0] == '\0') continue;\r
-               if (cmd[0] == 'q' && cmd[1] <= ' ') break;\r
+               if (p == NULL){\r
+                       break;\r
+               }\r
+               if (cmd[0] == '\0'){\r
+                       continue;\r
+               }\r
+               if (cmd[0] == 'q' && cmd[1] <= ' '){\r
+                       break;\r
+               }\r
                if (cmd[0] == 'p' && cmd[1] <= ' ' && cmd[1] != '\0') {\r
                        p = &cmd[2];\r
-                       while (*p <= ' ' && *p != '\0') p++;\r
+                       while (*p <= ' ' && *p != '\0'){\r
+                               p++;\r
+                       }\r
                        if (*p == 'R') {\r
                                i = dbgrGetRegNum(p + 1);\r
                                if (0 <= i && i <= 0x3f) {\r
                                        printf("R%02X = 0x%08X = %d\n", i, r->ireg[i], r->ireg[i]);\r
-                               }\r
-                               else\r
+                               } else{\r
                                        puts("register name error");\r
+                               }\r
                                continue;\r
                        }\r
                        if (*p == 'P') {\r
@@ -1485,7 +1688,9 @@ void dbgrMain(HOSECPU_RuntimeEnvironment *r)
                                        printf("P%02X:\n  type = %s(%04X),  (origin-ptr) = 0x%08X\n", i, p, r->preg[i].typ, (unsigned int)(r->preg[i].p0));\r
                                        if (r->preg[i].p != NULL && r->preg[i].p0 != NULL) {\r
                                                j = jitCompA000_dataWidth(jitCompA000_convTyp(r->preg[i].typ)) >> 3;\r
-                                               if (j <= 0) j = 1;\r
+                                               if (j <= 0){\r
+                                                       j = 1;\r
+                                               }\r
                                                k = (r->preg[i].p1 - r->preg[i].p0) / j;\r
                                                printf("  size = 0x%08X = %d\n", k, k);\r
                                                k = (r->preg[i].p - r->preg[i].p0) / j;\r
index 4044493..ef06215 100644 (file)
@@ -166,17 +166,15 @@ int jitCompA000_selectRegCache(int rxx, int reg)
 \r
 void jitCompA000_loadPRegCacheAll(struct JitCompWork *w)\r
 {\r
-       //      jitCompPutOp_MOV_GReg_EBPDisp(w, 5 /* EBP */, 256 + 0 * 32 + 0); /* EBP = P00; */\r
-       jitCompPutOp_MOV_GReg_EBPDisp(w, IA32_REG6_ESI, 256 + 1 * 32 + 0); /* ESI = P01; */\r
-       jitCompPutOp_MOV_GReg_EBPDisp(w, IA32_REG7_EDI, 256 + 2 * 32 + 0); /* EDI = P02; */\r
+       jitCompPutOp_MOV_GReg_EBPDisp(w, IA32_REG6_ESI, PRegOffset(0x01) + 0); /* ESI = P01; */\r
+       jitCompPutOp_MOV_GReg_EBPDisp(w, IA32_REG7_EDI, PRegOffset(0x02) + 0); /* EDI = P02; */\r
        return;\r
 }\r
 \r
 void jitCompA000_storePRegCacheAll(struct JitCompWork *w)\r
 {\r
-       //      jitCompPutOp_MOV_EBPDisp_GReg(w, 256 + 0 * 32 + 0, 5 /* EBP */); /* P00 = EBP; */\r
-       jitCompPutOp_MOV_EBPDisp_GReg(w, 256 + 1 * 32 + 0, IA32_REG6_ESI); /* P01 = ESI; */\r
-       jitCompPutOp_MOV_EBPDisp_GReg(w, 256 + 2 * 32 + 0, IA32_REG7_EDI); /* P02 = EDI; */\r
+       jitCompPutOp_MOV_EBPDisp_GReg(w, PRegOffset(0x01) + 0, IA32_REG6_ESI); /* P01 = ESI; */\r
+       jitCompPutOp_MOV_EBPDisp_GReg(w, PRegOffset(0x02) + 0, IA32_REG7_EDI); /* P02 = EDI; */\r
        return;\r
 }\r
 \r
@@ -237,7 +235,7 @@ void jitCompA0001_checkType0(struct JitCompWork *w, int pxx, int typ, int ac)
 {\r
        if (typ <= 0) { w->err = JITC_ERR_BADTYPE; }\r
        if (typ > 0x7f) { w->err = JITC_ERR_INTERNAL; }\r
-       jitCompPutOp_MOV_GReg_EBPDisp(w, IA32_REG0_EAX, 256 + pxx * 32 + 4); /* MOV(EAX, [EBP+?]); */   /* typ */\r
+       jitCompPutOp_MOV_GReg_EBPDisp(w, IA32_REG0_EAX, PRegOffset(pxx) + 4); /* MOV(EAX, [EBP+?]); */  /* typ */\r
        jitCompPutByte3(w->dst, 0x83, 0xf8, typ & 0x7f);        /* CMP(EAX, ?); */\r
        jitCompPutByte2(w->dst, 0x0f, 0x85); /* JNE */\r
        jitCompPutImm32(w->dst, errfnc - (w->dst + 4));\r
@@ -255,11 +253,11 @@ void jitCompA0001_checkType(struct JitCompWork *w, int pxx, int typ, int ac)
 void jitCompA0001_checkLimit(struct JitCompWork *w, int reg, int pxx)\r
 {\r
        jitCompPutByte1(w->dst, 0x3b);  /* CMP(reg, [EBP+?]); */\r
-       jitCompPutModRM_Disp_BaseEBP(w, 256 + pxx * 32 + 8, reg);       /* p0 */\r
+       jitCompPutModRM_Disp_BaseEBP(w, PRegOffset(pxx) + 8, reg);      /* p0 */\r
        jitCompPutByte2(w->dst, 0x0f, 0x82); /* JB */\r
        jitCompPutImm32(w->dst, errfnc - (w->dst + 4));\r
        jitCompPutByte1(w->dst, 0x3b);  /* CMP(reg, [EBP+?]); */\r
-       jitCompPutModRM_Disp_BaseEBP(w, 256 + pxx * 32 + 12, reg);      /* p1 */\r
+       jitCompPutModRM_Disp_BaseEBP(w, PRegOffset(pxx) + 12, reg);     /* p1 */\r
        jitCompPutByte2(w->dst, 0x0f, 0x83); /* JAE */\r
        jitCompPutImm32(w->dst, errfnc - (w->dst + 4));\r
        return;\r
diff --git a/main.c b/main.c
index 722b546..785bf03 100644 (file)
--- a/main.c
+++ b/main.c
-#include "osecpu.h"
-
-int *keybuf, keybuf_r, keybuf_w, keybuf_c;
-HOSECPU_Device_Window mainWindow;
-//デバッグ用。プログラム中の随所で加算される変数
-int di1_serial;
-
-
-
-unsigned char *Init_LoadSysLib(char argv0[], unsigned char *tmpWorkMemory);
-void LoadAppBin(HOSECPU_RuntimeEnvironment *env);
-
-void putKeybuf(int i)
-{
-       if (keybuf_c < KEYBUFSIZ) {
-               keybuf[keybuf_w] = i;
-               keybuf_c++;
-               keybuf_w = (keybuf_w + 1) & (KEYBUFSIZ - 1);
-       }
-       return;
-}
-
-int HeavyOSECPUMain(int argc, char **argv)
-{
-       FILE *fp;
-       unsigned char *jitbuf, *sysjit00, *sysjit;
-       unsigned char *systmp0, *systmp1, *systmp2;
-       unsigned char *opTbl;
-       HOSECPU_LabelListTag *label;
-       int tmpsiz, i;
-       double tm0, tm1, tm2;
-       HOSECPU_PointerControlTag *ptrCtrl;
-       unsigned char *syslib;
-       int argDebug = 0, stacksiz = 1;
-       const  char *cp;
-       HOSECPU_RuntimeEnvironment env;
-       void(*jitfunc)(char *);
-       unsigned char *jp;
-       
-       //Initialize mainWindow
-       mainWindow.vram = NULL;
-       mainWindow.xsize = 0;
-       mainWindow.ysize = 0;
-       di1_serial = 0;
-       
-       //実行環境初期化
-       env.mainArgc = argc;
-       env.mainArgv = (const char **)argv;
-       env.appBin = malloc(APPSIZ1);
-       env.executionLevel = JITC_LV_SLOWEST;
-       jitbuf = mallocRWE(1024 * 1024); /* とりあえず1MBで */
-       //unsigned char *sysjit0 = mallocRWE(SJITSIZ1), *sysjit1 = sysjit0, *sysjit00 = sysjit0;
-       // syslib.oseのjitc結果を格納する領域を確保。
-       sysjit00 = mallocRWE(SJITSIZ1);
-       sysjit = sysjit00;
-       // 現在の、jitc結果を格納するメモリへの書き込み位置のアドレス
-       // sysjit: 現在のjitc書き込み位置
-       // sysjit00: jitc結果の先頭
-       //ワークメモリを三つくらいもらう
-       systmp0 = malloc(SYSTMP0SIZ);   /* syslibのjitc用 */
-       systmp1 = malloc(SYSTMP1SIZ);
-       systmp2 = malloc(1024 * 1024);
-       
-       opTbl = malloc(256);
-       label = malloc(JITC_MAXLABELS * sizeof (HOSECPU_LabelListTag));
-       keybuf = malloc(KEYBUFSIZ * sizeof (int));
-       keybuf_r = keybuf_w = keybuf_c = 0;
-       ptrCtrl = malloc(PTRCTRLSIZ * sizeof (HOSECPU_PointerControlTag));
-       
-       randStatInit((unsigned int)time(NULL));
-       for (i = 0; i < PTRCTRLSIZ; i++) {
-               ptrCtrl[i].liveSign = 0;
-               ptrCtrl[i].size = -1;
-       }
-       ptrCtrl[0].size = -2;
-       
-       /* syslibの読み込み */
-       syslib = Init_LoadSysLib(argv[0], systmp0);
-       
-       sysjit = jitCompInit(sysjit);
-       sysjit00 = sysjit;
-       // labelはjitc0()内で初期化される。
-       i = jitc0(&sysjit, sysjit00 + SJITSIZ1, syslib + 32, syslib + SYSLIBSIZ1, JITC_LV_SLOWEST+9, label);
-       if (i != 0){
-               fputs("syslib-file JITC error.\n", stderr);
-               return 1;
-       }
-       
-       // エラー時にデバッグ用に表示する変数を加算
-       di1_serial++;
-       
-       /* アプリバイナリの読み込み */
-       LoadAppBin(&env);
-       
-       /* クロック初期化 */
-       tm0 = clock() / (double)CLOCKS_PER_SEC;
-       
-       if (env.appBin[2] == 0xf0) {
-               // tek5圧縮がかかっている
-#if (USE_TEK5 != 0)
-               env.appSize1 = tek5Decomp(env.appBin + 2, env.appBin + env.appSize0, systmp0);
-               env.appSize1 += 2;
-#else
-               env.appSize1 = -9;
-#endif
-               if (env.appSize1 < 0) {
-                       fputs("unsupported-format(tek5)\n", stderr);
-                       return 1;
-               }
-       }
-       //デバッグモード指定
-       cp = searchArg(argc, (const char **)argv, "debug:", 0);
-       if (cp != NULL){
-               argDebug = *cp - '0';
-       }
-       //スタックサイズ指定(MiB単位)
-       cp = searchArg(argc, (const char **)argv, "stack:", 0);
-       if (cp != NULL){
-               stacksiz = strtol(cp, NULL, 0);
-       }
-
-       // jitbufは先頭。 jpは現在位置
-       jp = jitbuf; /* JIT-pointer */
-       
-       /* フロントエンドコードをバックエンドコードに変換する */
-       if ((env.appBin[2] & 0xf0) != 0) {                              // 3バイト目が00なら処理しない
-               systmp0[0] = env.appBin[0];
-               systmp0[1] = env.appBin[1];
-               env.preg[2].p = systmp0 + 2;
-               env.preg[3].p = systmp0 + SYSTMP0SIZ;
-               env.preg[4].p = env.appBin + 2;
-               env.preg[5].p = env.appBin + env.appSize1;
-               env.preg[6].p = systmp1;
-               env.preg[7].p = systmp1 + SYSTMP1SIZ;
-               env.preg[10].p = systmp2;
-               int pxxFlag[64], typLabel[4096];
-               env.preg[0x0b].p = (void *)pxxFlag;
-               env.preg[0x0c].p = (void *)typLabel;
-               env.preg[0x0d].p = opTbl;
-               jitfunc = (void *)sysjit00;
-               (*jitfunc)(((char *)&env) + 128); /* サイズを節約するためにEBPを128バイトずらす */
-               if (env.ireg[0] != 0) {
-                       jp = env.preg[2].p - 1;
-                       fprintf(stderr, "unpack error: %02X (at %06X) (R00=%d)\n", *jp, jp - systmp0, env.ireg[0]);
-                       if ((argDebug & 2) != 0) {
-                               fp = fopen("debug2.bin", "wb");
-                               fwrite(systmp0, 1, jp - systmp0 + 16, fp);
-                               fclose(fp);
-                       }
-                       exit(1);
-               }
-               tmpsiz = env.preg[2].p - systmp0;
-       } else{
-               memcpy(systmp0, env.appBin, env.appSize1);
-               tmpsiz = env.appSize1;
-       }
-       
-       if ((argDebug & 2) != 0) {
-               /*変換後のバックエンドコードをファイルへ保存*/
-               fp = fopen("debug2.bin", "wb");
-               fwrite(systmp0, 1, tmpsiz, fp);
-               fclose(fp);
-       }
-       
-       //JITコンパイル
-       i = jitc0(&jp, jitbuf + 1024 * 1024, systmp0, systmp0 + tmpsiz, env.executionLevel, label);
-       if (i == 1){
-               fputs("app-file header error.\n", stderr);
-               return 1;
-       }
-       if (i != 0){
-               return 1;
-       }
-       di1_serial++;
-       
-       int appsiz2 = jp - jitbuf;
-       
-       unsigned char *p28 = jp;
-       jp = jitCompCallFunc(jp, &devFunc);
-       
-       tm1 = clock() / (double)CLOCKS_PER_SEC;
-       
-       /* レジスタ初期化 */
-       for (i = 0; i < 64; i++){
-               env.ireg[i] = 0;
-       }
-       for (i = 0; i < 64; i++) {
-               env.preg[i].p = NULL;
-               env.preg[i].typ = -1;
-               env.preg[i].p0 = NULL;
-               env.preg[i].p1 = NULL;
-       }
-       
-       env.buf0 = env.buf1 = NULL;
-
-       // p28にapiをコールするアドレスを設定
-       env.preg[0x28].p = p28; // p28には、devFuncをコールするコードが書かれている
-       env.preg[0x28].typ = 0; // TYP_CODE
-       env.preg[0x28].p0 = p28;                // アドレス演算できる範囲を制限
-       env.preg[0x28].p1 = p28 + 1;    // アドレス演算できる範囲を制限
-
-       //env.preg[0x00].p = malloc(1024 * 1024) + (1024 * 1024 - 32);
-       env.junkStack = malloc(stacksiz << 20);
-       env.junkStack1 = env.junkStack + (stacksiz << 20);
-       env.winClosed = 0;
-       env.autoSleep = 0;
-       env.lastConsoleChar = '\n';
-       
-       env.label = label;
-       env.maxLabels = JITC_MAXLABELS;
-       env.jitbuf = jp;
-       env.jitbuf1 = jitbuf + 1024 * 1024;
-       env.errHndl = &errorHandler;
-       env.appReturnCode = 0;
-       
-       env.dbgr = 0;
-       if (searchArg(argc, (const char **)argv, "dbgr:1", 0) != NULL){
-               env.dbgr = 1;
-       }
-       
-       if ((argDebug & 1) != 0) {
-               fp = fopen("debug1.bin", "wb");
-               fwrite(jitbuf, 1, jp - jitbuf, fp);
-               fclose(fp);
-       }
-       
-       /* JITコード実行 */
-       jitfunc = (void *)jitbuf;
-       if (setjmp(env.setjmpEnv) == 0){
-               (*jitfunc)(((char *)&env) + 128); /* サイズを節約するためにEBPを128バイトずらす */
-       }
-       if (env.autoSleep != 0) {
-               if (mainWindow.vram != NULL){
-                       drv_flshWin(mainWindow.xsize, mainWindow.ysize, 0, 0);
-               }
-               while (env.winClosed == 0){
-                       drv_sleep(100);
-               }
-       }
-       if (env.lastConsoleChar != '\n'){
-               putchar('\n');
-       }
-       
-       tm2 = clock() / (double)CLOCKS_PER_SEC;
-       
-       /* 実行結果確認のためのレジスタダンプ */
-       if (searchArg(argc, (const char **)argv, "verbose:1", 0) != NULL) {
-               printf("time: JITC=%.3f[sec], exec=%.3f[sec]\n", tm1 - tm0, tm2 - tm1);
-               printf("size: OSECPU=%d, decomp=%d, tmp=%d, native=%d\n", env.appSize0, env.appSize1, tmpsiz, appsiz2);
-               printf("result:\n");
-               printf("R00:0x%08X  R01:0x%08X  R02:0x%08X  R03:0x%08X\n", env.ireg[0], env.ireg[1], env.ireg[2], env.ireg[3]);
-       }
-#if (USE_DEBUGGER != 0)
-       dbgrMain(&env);
-#endif
-       return env.appReturnCode;
-}
-
-unsigned char *Init_LoadSysLib(char argv0[], unsigned char *tmpWorkMemory)
-{
-       unsigned char *syslib;
-       FILE *fp;
-       unsigned char *up;
-       int appsize;
-       
-       /* syslibの読み込み */
-       syslib = malloc(SYSLIBSIZ1);
-       fp = fopen(SYSLIB_OSE, "rb");
-       if (fp == NULL) {
-               syslib[0] = '/';
-               strcpy((char *)syslib + 1, argv0);
-               up = syslib + 1;
-               while (*up != '\0'){
-                       up++;
-               }
-               while (*up != '/' && *up != 0x5c){
-                       up--;
-               }
-               up++;
-               strcpy((char *)up, SYSLIB_OSE);
-               fp = fopen((char *)syslib + 1, "rb");
-       }
-       if (fp == NULL) {
-               fputs("syslib-file fopen error.\n", stderr);
-               exit(EXIT_FAILURE);
-       }
-       appsize = fread(syslib, 1, SYSLIBSIZ1 - 4, fp);
-       fclose(fp);
-       if (appsize >= SYSLIBSIZ1 - 4) {
-               fputs("syslib-file too large.\n", stderr);
-               exit(EXIT_FAILURE);
-       }
-       if (syslib[0] == 0x05 && syslib[1] == 0xc1) {
-               // maklib のライブラリ形式である。
-               memcpy(tmpWorkMemory, syslib, appsize);
-               ComLib_main(tmpWorkMemory + 2, syslib + 2);
-               syslib[0] = 0x05;
-               syslib[1] = 0x1b;
-       }
-       
-       fp = fopen("syslib_dbg.ose", "wb");
-       fwrite(syslib, 1, SYSLIBSIZ1, fp);
-       fclose(fp);
-       return syslib;
-}
-
-void LoadAppBin(HOSECPU_RuntimeEnvironment *env)
-{
-       FILE *fp;
-       const char *fileName;
-       /* アプリバイナリの読み込み */
-       if (env->mainArgc <= 1) {
-               //アプリ名未指定なので何事もなく終了
-               exit(EXIT_SUCCESS);
-       }
-       fileName = env->mainArgv[1];
-       //アプリ名先頭に:n:をつけることでレベルnでの実行が可能?
-       if (fileName[0] == ':' && fileName[2] == ':') {
-               env->executionLevel = fileName[1] - '0';
-               if (env->executionLevel < 0 || env->executionLevel > 9){
-                       env->executionLevel = JITC_LV_SLOWEST;
-               }
-               fileName += 3;
-       }
-       
-       fp = fopen(fileName, "rb");
-       if (fp == NULL) {
-               fputs("app-file load error.\n", stderr);
-               exit(EXIT_FAILURE);
-       }
-       env->appSize0 = fread(env->appBin, 1, APPSIZ1 - 4, fp);
-       env->appSize1 = env->appSize0;
-       fclose(fp);
-       
-       if (env->appSize0 >= APPSIZ1 - 4) {
-               fputs("app-file too large.\n", stderr);
-               exit(EXIT_FAILURE);
-       }
-       if (env->appSize0 < 3) {
-               fputs("app-file header error.\n", stderr);
-               exit(EXIT_FAILURE);
-       }
-}
+#include "osecpu.h"\r
+\r
+int *keybuf, keybuf_r, keybuf_w, keybuf_c;\r
+HOSECPU_Device_Window mainWindow;\r
+//デバッグ用。プログラム中の随所で加算される変数\r
+int di1_serial;\r
+\r
+\r
+\r
+unsigned char *Init_LoadSysLib(char argv0[], unsigned char *tmpWorkMemory);\r
+void LoadAppBin(HOSECPU_RuntimeEnvironment *env);\r
+\r
+void putKeybuf(int i)\r
+{\r
+       if (keybuf_c < KEYBUFSIZ) {\r
+               keybuf[keybuf_w] = i;\r
+               keybuf_c++;\r
+               keybuf_w = (keybuf_w + 1) & (KEYBUFSIZ - 1);\r
+       }\r
+       return;\r
+}\r
+\r
+int HeavyOSECPUMain(int argc, char **argv)\r
+{\r
+       FILE *fp;\r
+       unsigned char *jitbuf, *sysjit00, *sysjit;\r
+       unsigned char *systmp0, *systmp1, *systmp2;\r
+       unsigned char *opTbl;\r
+       HOSECPU_LabelListTag *label;\r
+       int tmpsiz, i;\r
+       double tm0, tm1, tm2;\r
+       HOSECPU_PointerControlTag *ptrCtrl;\r
+       unsigned char *syslib;\r
+       int argDebug = 0, stacksiz = 1;\r
+       const  char *cp;\r
+       HOSECPU_RuntimeEnvironment env;\r
+       void(*jitfunc)(char *);\r
+       unsigned char *jp;\r
+       \r
+       //Initialize mainWindow\r
+       mainWindow.vram = NULL;\r
+       mainWindow.xsize = 0;\r
+       mainWindow.ysize = 0;\r
+       di1_serial = 0;\r
+       \r
+       //実行環境初期化\r
+       env.mainArgc = argc;\r
+       env.mainArgv = (const char **)argv;\r
+       env.appBin = malloc(APPSIZ1);\r
+       env.executionLevel = JITC_LV_SLOWEST;\r
+       jitbuf = mallocRWE(1024 * 1024); /* とりあえず1MBで */\r
+       //unsigned char *sysjit0 = mallocRWE(SJITSIZ1), *sysjit1 = sysjit0, *sysjit00 = sysjit0;\r
+       // syslib.oseのjitc結果を格納する領域を確保。\r
+       sysjit00 = mallocRWE(SJITSIZ1);\r
+       sysjit = sysjit00;\r
+       // 現在の、jitc結果を格納するメモリへの書き込み位置のアドレス\r
+       // sysjit: 現在のjitc書き込み位置\r
+       // sysjit00: jitc結果の先頭\r
+       //ワークメモリを三つくらいもらう\r
+       systmp0 = malloc(SYSTMP0SIZ);   /* syslibのjitc用 */\r
+       systmp1 = malloc(SYSTMP1SIZ);\r
+       systmp2 = malloc(1024 * 1024);\r
+       \r
+       opTbl = malloc(256);\r
+       label = malloc(JITC_MAXLABELS * sizeof (HOSECPU_LabelListTag));\r
+       keybuf = malloc(KEYBUFSIZ * sizeof (int));\r
+       keybuf_r = keybuf_w = keybuf_c = 0;\r
+       ptrCtrl = malloc(PTRCTRLSIZ * sizeof (HOSECPU_PointerControlTag));\r
+       \r
+       randStatInit((unsigned int)time(NULL));\r
+       for (i = 0; i < PTRCTRLSIZ; i++) {\r
+               ptrCtrl[i].liveSign = 0;\r
+               ptrCtrl[i].size = -1;\r
+       }\r
+       ptrCtrl[0].size = -2;\r
+       \r
+       /* syslibの読み込み */\r
+       syslib = Init_LoadSysLib(argv[0], systmp0);\r
+       \r
+       sysjit = jitCompInit(sysjit);\r
+       sysjit00 = sysjit;\r
+       // labelはjitc0()内で初期化される。\r
+       i = jitc0(&sysjit, sysjit00 + SJITSIZ1, syslib + 32, syslib + SYSLIBSIZ1, JITC_LV_SLOWEST+9, label);\r
+       if (i != 0){\r
+               fputs("syslib-file JITC error.\n", stderr);\r
+               return 1;\r
+       }\r
+       \r
+       // エラー時にデバッグ用に表示する変数を加算\r
+       di1_serial++;\r
+       \r
+       /* アプリバイナリの読み込み */\r
+       LoadAppBin(&env);\r
+       \r
+       /* クロック初期化 */\r
+       tm0 = clock() / (double)CLOCKS_PER_SEC;\r
+       \r
+       if (env.appBin[2] == 0xf0) {\r
+               // tek5圧縮がかかっている\r
+#if (USE_TEK5 != 0)\r
+               env.appSize1 = tek5Decomp(env.appBin + 2, env.appBin + env.appSize0, systmp0);\r
+               env.appSize1 += 2;\r
+#else\r
+               env.appSize1 = -9;\r
+#endif\r
+               if (env.appSize1 < 0) {\r
+                       fputs("unsupported-format(tek5)\n", stderr);\r
+                       return 1;\r
+               }\r
+       }\r
+       //デバッグモード指定\r
+       cp = searchArg(argc, (const char **)argv, "debug:", 0);\r
+       if (cp != NULL){\r
+               argDebug = *cp - '0';\r
+       }\r
+       //スタックサイズ指定(MiB単位)\r
+       cp = searchArg(argc, (const char **)argv, "stack:", 0);\r
+       if (cp != NULL){\r
+               stacksiz = strtol(cp, NULL, 0);\r
+       }\r
+\r
+       // jitbufは先頭。 jpは現在位置\r
+       jp = jitbuf; /* JIT-pointer */\r
+       \r
+       /* フロントエンドコードをバックエンドコードに変換する */\r
+       if ((env.appBin[2] & 0xf0) != 0) {                              // 3バイト目が00なら処理しない\r
+               systmp0[0] = env.appBin[0];\r
+               systmp0[1] = env.appBin[1];\r
+               env.preg[2].p = systmp0 + 2;\r
+               env.preg[3].p = systmp0 + SYSTMP0SIZ;\r
+               env.preg[4].p = env.appBin + 2;\r
+               env.preg[5].p = env.appBin + env.appSize1;\r
+               env.preg[6].p = systmp1;\r
+               env.preg[7].p = systmp1 + SYSTMP1SIZ;\r
+               env.preg[10].p = systmp2;\r
+               int pxxFlag[64], typLabel[4096];\r
+               env.preg[0x0b].p = (void *)pxxFlag;\r
+               env.preg[0x0c].p = (void *)typLabel;\r
+               env.preg[0x0d].p = opTbl;\r
+               jitfunc = (void *)sysjit00;\r
+               (*jitfunc)(((char *)&env) + 128); /* サイズを節約するためにEBPを128バイトずらす */\r
+               if (env.ireg[0] != 0) {\r
+                       jp = env.preg[2].p - 1;\r
+                       fprintf(stderr, "unpack error: %02X (at %06X) (R00=%d)\n", *jp, jp - systmp0, env.ireg[0]);\r
+                       if ((argDebug & 2) != 0) {\r
+                               fp = fopen("debug2.bin", "wb");\r
+                               fwrite(systmp0, 1, jp - systmp0 + 16, fp);\r
+                               fclose(fp);\r
+                       }\r
+                       exit(1);\r
+               }\r
+               tmpsiz = env.preg[2].p - systmp0;\r
+       } else{\r
+               memcpy(systmp0, env.appBin, env.appSize1);\r
+               tmpsiz = env.appSize1;\r
+       }\r
+       \r
+       if ((argDebug & 2) != 0) {\r
+               /*変換後のバックエンドコードをファイルへ保存*/\r
+               fp = fopen("debug2.bin", "wb");\r
+               fwrite(systmp0, 1, tmpsiz, fp);\r
+               fclose(fp);\r
+       }\r
+       \r
+       //JITコンパイル\r
+       i = jitc0(&jp, jitbuf + 1024 * 1024, systmp0, systmp0 + tmpsiz, env.executionLevel, label);\r
+       if (i == 1){\r
+               fputs("app-file header error.\n", stderr);\r
+               return 1;\r
+       }\r
+       if (i != 0){\r
+               return 1;\r
+       }\r
+       di1_serial++;\r
+       \r
+       int appsiz2 = jp - jitbuf;\r
+       \r
+       unsigned char *p28 = jp;\r
+       jp = jitCompCallFunc(jp, &devFunc);\r
+       \r
+       tm1 = clock() / (double)CLOCKS_PER_SEC;\r
+       \r
+       /* レジスタ初期化 */\r
+       for (i = 0; i < 64; i++){\r
+               env.ireg[i] = 0;\r
+       }\r
+       for (i = 0; i < 64; i++) {\r
+               env.preg[i].p = NULL;\r
+               env.preg[i].typ = -1;\r
+               env.preg[i].p0 = NULL;\r
+               env.preg[i].p1 = NULL;\r
+       }\r
+       \r
+       env.buf0 = env.buf1 = NULL;\r
+\r
+       // p28にapiをコールするアドレスを設定\r
+       env.preg[0x28].p = p28; // p28には、devFuncをコールするコードが書かれている\r
+       env.preg[0x28].typ = 0; // TYP_CODE\r
+       env.preg[0x28].p0 = p28;                // アドレス演算できる範囲を制限\r
+       env.preg[0x28].p1 = p28 + 1;    // アドレス演算できる範囲を制限\r
+\r
+       //env.preg[0x00].p = malloc(1024 * 1024) + (1024 * 1024 - 32);\r
+       env.junkStack = malloc(stacksiz << 20);\r
+       env.junkStack1 = env.junkStack + (stacksiz << 20);\r
+       env.winClosed = 0;\r
+       env.autoSleep = 0;\r
+       env.lastConsoleChar = '\n';\r
+       \r
+       env.label = label;\r
+       env.maxLabels = JITC_MAXLABELS;\r
+       env.jitbuf = jp;\r
+       env.jitbuf1 = jitbuf + 1024 * 1024;\r
+       env.errHndl = &errorHandler;\r
+       env.appReturnCode = 0;\r
+       \r
+       env.dbgr = 0;\r
+       if (searchArg(argc, (const char **)argv, "dbgr:1", 0) != NULL){\r
+               env.dbgr = 1;\r
+       }\r
+       \r
+       if ((argDebug & 1) != 0) {\r
+               fp = fopen("debug1.bin", "wb");\r
+               fwrite(jitbuf, 1, jp - jitbuf, fp);\r
+               fclose(fp);\r
+       }\r
+       \r
+       /* JITコード実行 */\r
+       jitfunc = (void *)jitbuf;\r
+       if (setjmp(env.setjmpEnv) == 0){\r
+               (*jitfunc)(((char *)&env) + 128); /* サイズを節約するためにEBPを128バイトずらす */\r
+       }\r
+       if (env.autoSleep != 0) {\r
+               if (mainWindow.vram != NULL){\r
+                       drv_flshWin(mainWindow.xsize, mainWindow.ysize, 0, 0);\r
+               }\r
+               while (env.winClosed == 0){\r
+                       drv_sleep(100);\r
+               }\r
+       }\r
+       if (env.lastConsoleChar != '\n'){\r
+               putchar('\n');\r
+       }\r
+       \r
+       tm2 = clock() / (double)CLOCKS_PER_SEC;\r
+       \r
+       /* 実行結果確認のためのレジスタダンプ */\r
+       if (searchArg(argc, (const char **)argv, "verbose:1", 0) != NULL) {\r
+               printf("time: JITC=%.3f[sec], exec=%.3f[sec]\n", tm1 - tm0, tm2 - tm1);\r
+               printf("size: OSECPU=%d, decomp=%d, tmp=%d, native=%d\n", env.appSize0, env.appSize1, tmpsiz, appsiz2);\r
+               printf("result:\n");\r
+               printf("R00:0x%08X  R01:0x%08X  R02:0x%08X  R03:0x%08X\n", env.ireg[0], env.ireg[1], env.ireg[2], env.ireg[3]);\r
+       }\r
+#if (USE_DEBUGGER != 0)\r
+       dbgrMain(&env);\r
+#endif\r
+       return env.appReturnCode;\r
+}\r
+\r
+unsigned char *Init_LoadSysLib(char argv0[], unsigned char *tmpWorkMemory)\r
+{\r
+       unsigned char *syslib;\r
+       FILE *fp;\r
+       unsigned char *up;\r
+       int appsize;\r
+       \r
+       /* syslibの読み込み */\r
+       syslib = malloc(SYSLIBSIZ1);\r
+       fp = fopen(SYSLIB_OSE, "rb");\r
+       if (fp == NULL) {\r
+               syslib[0] = '/';\r
+               strcpy((char *)syslib + 1, argv0);\r
+               up = syslib + 1;\r
+               while (*up != '\0'){\r
+                       up++;\r
+               }\r
+               while (*up != '/' && *up != 0x5c){\r
+                       up--;\r
+               }\r
+               up++;\r
+               strcpy((char *)up, SYSLIB_OSE);\r
+               fp = fopen((char *)syslib + 1, "rb");\r
+       }\r
+       if (fp == NULL) {\r
+               fputs("syslib-file fopen error.\n", stderr);\r
+               exit(EXIT_FAILURE);\r
+       }\r
+       appsize = fread(syslib, 1, SYSLIBSIZ1 - 4, fp);\r
+       fclose(fp);\r
+       if (appsize >= SYSLIBSIZ1 - 4) {\r
+               fputs("syslib-file too large.\n", stderr);\r
+               exit(EXIT_FAILURE);\r
+       }\r
+       if (syslib[0] == 0x05 && syslib[1] == 0xc1) {\r
+               // maklib のライブラリ形式である。\r
+               memcpy(tmpWorkMemory, syslib, appsize);\r
+               ComLib_main(tmpWorkMemory + 2, syslib + 2);\r
+               syslib[0] = 0x05;\r
+               syslib[1] = 0x1b;\r
+       }\r
+       \r
+       fp = fopen("syslib_dbg.ose", "wb");\r
+       fwrite(syslib, 1, SYSLIBSIZ1, fp);\r
+       fclose(fp);\r
+       return syslib;\r
+}\r
+\r
+void LoadAppBin(HOSECPU_RuntimeEnvironment *env)\r
+{\r
+       FILE *fp;\r
+       const char *fileName;\r
+       /* アプリバイナリの読み込み */\r
+       if (env->mainArgc <= 1) {\r
+               //アプリ名未指定なので何事もなく終了\r
+               exit(EXIT_SUCCESS);\r
+       }\r
+       fileName = env->mainArgv[1];\r
+       //アプリ名先頭に:n:をつけることでレベルnでの実行が可能?\r
+       if (fileName[0] == ':' && fileName[2] == ':') {\r
+               env->executionLevel = fileName[1] - '0';\r
+               if (env->executionLevel < 0 || env->executionLevel > 9){\r
+                       env->executionLevel = JITC_LV_SLOWEST;\r
+               }\r
+               fileName += 3;\r
+       }\r
+       \r
+       fp = fopen(fileName, "rb");\r
+       if (fp == NULL) {\r
+               fputs("app-file load error.\n", stderr);\r
+               exit(EXIT_FAILURE);\r
+       }\r
+       env->appSize0 = fread(env->appBin, 1, APPSIZ1 - 4, fp);\r
+       env->appSize1 = env->appSize0;\r
+       fclose(fp);\r
+       \r
+       if (env->appSize0 >= APPSIZ1 - 4) {\r
+               fputs("app-file too large.\n", stderr);\r
+               exit(EXIT_FAILURE);\r
+       }\r
+       if (env->appSize0 < 3) {\r
+               fputs("app-file header error.\n", stderr);\r
+               exit(EXIT_FAILURE);\r
+       }\r
+}\r
index 23844af..f0969b8 100644 (file)
--- a/osecpu.h
+++ b/osecpu.h
@@ -138,9 +138,9 @@ struct Regs {
     //\r
        int debugInfo0;                                                         // 2304\r
        int debugInfo1;                                                         // 2308\r
-       int dmy[2];                                                                     // 4 * 2 = 8\r
+       int dmy[2];                                                                     // 2312, 2316\r
        //\r
-       HOSECPU_PointerControlTag *ptrCtrl;\r
+       HOSECPU_PointerControlTag *ptrCtrl;         // 2320\r
        char winClosed, autoSleep;\r
        jmp_buf setjmpEnv;\r
     int appReturnCode;      // アプリ自体の終了コード\r
@@ -196,11 +196,13 @@ const char *searchArg(int argc, const char **argv, const char *tag, int i); // 
 void devFunc(HOSECPU_RuntimeEnvironment *r); // junkApiを処理する関数\r
 \r
 // @jitc.c\r
+void errorHandler(HOSECPU_RuntimeEnvironment *r);\r
+\r
+// @jitcx86.c\r
 int jitc0(unsigned char **qq, unsigned char *q1, const unsigned char *p0, const unsigned char *p1, int level, HOSECPU_LabelListTag *label);\r
 int jitCompiler(unsigned char *dst, unsigned char *dst1, const unsigned char *src, const unsigned char *src1, const unsigned char *src0, HOSECPU_LabelListTag *label, int maxLabels, int level, int debugInfo1, int flags);\r
 unsigned char *jitCompCallFunc(unsigned char *dst, void *func);\r
 unsigned char *jitCompInit(unsigned char *dst);\r
-void errorHandler(HOSECPU_RuntimeEnvironment *r);\r
 \r
 // @randmt.c\r
 void randStatInit(unsigned int seed);\r