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
//\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
}\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
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
}\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
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
\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
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
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
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
/* これをやってはいけない！(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
}\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
#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
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
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
// 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
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
}\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
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
\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
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
}\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
}\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
\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
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
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
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
}\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
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
}\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
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
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
\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
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
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
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
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
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
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
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
{\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
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
{\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
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
}\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
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
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
OSDN Git Service
