ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Prepare instruction table for dynamic translator by inlining read_imm8() and do_op()

Browse source
This commit is contained in:
copy 2015-04-22 04:23:22 +02:00
parent 742afcadbf
commit 04c20fd871
4 changed files with 33 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/arith.macro.js
View file

@ -653,11 +653,10 @@ CPU.prototype.bcd_das = function()
this.flags_changed = flags_all & ~1 & ~flag_adjust & ~flag_overflow;
}
CPU.prototype.bcd_aam = function()
CPU.prototype.bcd_aam = function(imm8)
{
//dbg_log("aam");
// ascii adjust after multiplication
var imm8 = this.read_imm8();
if(imm8 === 0)
{
@ -676,11 +675,10 @@ CPU.prototype.bcd_aam = function()
}
}
CPU.prototype.bcd_aad = function()
CPU.prototype.bcd_aad = function(imm8)
{
//dbg_log("aad");
// ascii adjust before division
var imm8 = this.read_imm8();
this.last_result = this.reg8[reg_al] + this.reg8[reg_ah] * imm8 & 0xFF;
this.reg16[reg_ax] = this.last_result;

13
src/cpu.macro.js
View file

@ -1780,19 +1780,6 @@ CPU.prototype.trigger_ss = function(code)
this.raise_exception_with_code(12, code);
};
/**
* @param {number} seg
*/
CPU.prototype.seg_prefix = function(seg)
{
dbg_assert(this.segment_prefix === SEG_PREFIX_NONE);
dbg_assert(seg >= 0 && seg <= 5);
this.segment_prefix = seg;
this.table[this.read_imm8()](this);
this.segment_prefix = SEG_PREFIX_NONE;
};
CPU.prototype.get_seg_prefix_ds = function()
{
return this.get_seg_prefix(reg_ds);

31
src/instructions.macro.js
View file

@ -323,17 +323,17 @@ pop_sreg_op(0x1F, reg_ds);
arith_group(0x20, and);
op(0x26, { cpu.seg_prefix(reg_es); });
op(0x26, { cpu.segment_prefix = reg_es; cpu.do_op(); cpu.segment_prefix = SEG_PREFIX_NONE; });
op(0x27, { cpu.bcd_daa(); });
arith_group(0x28, sub);
op(0x2E, { cpu.seg_prefix(reg_cs); });
op(0x2E, { cpu.segment_prefix = reg_cs; cpu.do_op(); cpu.segment_prefix = SEG_PREFIX_NONE; });
op(0x2F, { cpu.bcd_das(); });
arith_group(0x30, xor);
op(0x36, { cpu.seg_prefix(reg_ss); });
op(0x36, { cpu.segment_prefix = reg_ss; cpu.do_op(); cpu.segment_prefix = SEG_PREFIX_NONE; });
op(0x37, { cpu.bcd_aaa(); });
opm(0x38, { read_e8; cmp8(data, reg_g8); })
@ -343,7 +343,7 @@ opm2(0x3B, { read_e16; cmp16(reg_g16, data); }, { read_e32s; cmp32(reg_g32s, dat
op(0x3C, { cmp8(cpu.reg8[reg_al], cpu.read_imm8()); })
op2(0x3D, { cmp16(cpu.reg16[reg_ax], cpu.read_imm16()); }, { cmp32(cpu.reg32s[reg_eax], cpu.read_imm32s()); })
op(0x3E, { cpu.seg_prefix(reg_ds); });
op(0x3E, { cpu.segment_prefix = reg_ds; cpu.do_op(); cpu.segment_prefix = SEG_PREFIX_NONE; });
op(0x3F, { cpu.bcd_aas(); });
@ -406,8 +406,8 @@ opm(0x63, {
}
});
op(0x64, { cpu.seg_prefix(reg_fs); });
op(0x65, { cpu.seg_prefix(reg_gs); });
op(0x64, { cpu.segment_prefix = reg_fs; cpu.do_op(); cpu.segment_prefix = SEG_PREFIX_NONE; });
op(0x65, { cpu.segment_prefix = reg_gs; cpu.do_op(); cpu.segment_prefix = SEG_PREFIX_NONE; });
op2(0x66, {
// Operand-size override prefix
@ -472,11 +472,10 @@ op2(0x6F, { outsw(cpu); }, { outsd(cpu); });
#define group70(n, test) \
op(0x70 | n, { \
var imm8 = cpu.read_imm8s();\
if(test) { \
cpu.instruction_pointer = cpu.instruction_pointer + cpu.read_imm8s() | 0;\
cpu.instruction_pointer = cpu.instruction_pointer + imm8 | 0;\
}\
cpu.instruction_pointer++;\
cpu.last_instr_jump = true;\
});
each_jcc(group70);
@ -963,7 +962,7 @@ opm2(0xC5, {
opm(0xC6, { set_eb(cpu.read_imm8()); })
opm2(0xC7, { set_ev16(cpu.read_imm16()); }, { set_ev32(cpu.read_imm32s()); })
op2(0xC8, { cpu.enter16(); }, { cpu.enter32(); });
op2(0xC8, { cpu.enter16(cpu.read_imm16(), cpu.read_imm8()); }, { cpu.enter32(cpu.read_imm16(), cpu.read_imm8()); });
op2(0xC9, {
// leave
var new_bp = cpu.safe_read16(cpu.get_seg(reg_ss) + cpu.stack_reg[cpu.reg_vbp] | 0);
@ -1117,10 +1116,10 @@ opm2(0xD3, {
});
op(0xD4, {
cpu.bcd_aam();
cpu.bcd_aam(cpu.read_imm8());
});
op(0xD5, {
cpu.bcd_aad();
cpu.bcd_aad(cpu.read_imm8());
});
op(0xD6, {
@ -1163,10 +1162,10 @@ fpu_op(0xDF, DF);
#undef fpu_op
op(0xE0, { cpu.loopne(); });
op(0xE1, { cpu.loope(); });
op(0xE2, { cpu.loop(); });
op(0xE3, { cpu.jcxz(); });
op(0xE0, { cpu.loopne(cpu.read_imm8s()); });
op(0xE1, { cpu.loope(cpu.read_imm8s()); });
op(0xE2, { cpu.loop(cpu.read_imm8s()); });
op(0xE3, { cpu.jcxz(cpu.read_imm8s()); });
op(0xE4, {
var port = cpu.read_imm8();

49
src/misc_instr.macro.js
View file

@ -56,49 +56,32 @@ CPU.prototype.jmpcc32 = function(condition)
}
}
CPU.prototype.loopne = function()
CPU.prototype.loopne = function(imm8s)
{
if(--this.regv[this.reg_vcx] && !this.getzf())
{
var imm8s = this.read_imm8s();
this.instruction_pointer = this.instruction_pointer + imm8s | 0;
}
else
{
this.instruction_pointer++;
}
}
CPU.prototype.loope = function()
CPU.prototype.loope = function(imm8s)
{
if(--this.regv[this.reg_vcx] && this.getzf())
{
var imm8s = this.read_imm8s();
this.instruction_pointer = this.instruction_pointer + imm8s | 0;
}
else
{
this.instruction_pointer++;
}
}
CPU.prototype.loop = function()
CPU.prototype.loop = function(imm8s)
{
if(--this.regv[this.reg_vcx])
{
var imm8s = this.read_imm8s();
this.instruction_pointer = this.instruction_pointer + imm8s | 0;
}
else
{
this.instruction_pointer++;
}
}
CPU.prototype.jcxz = function()
CPU.prototype.jcxz = function(imm8s)
{
var imm8s = this.read_imm8s();
if(this.regv[this.reg_vcx] === 0)
{
this.instruction_pointer = this.instruction_pointer + imm8s | 0;
@ -376,14 +359,14 @@ CPU.prototype.lss32 = function(seg, addr, mod)
this.reg32s[mod] = new_reg;
}
CPU.prototype.enter16 = function()
CPU.prototype.enter16 = function(size, nesting_level)
{
var size = this.read_imm16(),
nesting_level = this.read_imm8() & 31,
frame_temp,
tmp_ebp;
nesting_level &= 31;
//dbg_log("enter16 size=" + size + " nest=" + nesting_level, LOG_CPU);
var frame_temp;
var tmp_ebp;
//dbg_log("enter16 stack=" + (this.stack_size_32 ? 32 : 16) + " size=" + size + " nest=" + nesting_level, LOG_CPU);
this.push16(this.reg16[reg_bp]);
frame_temp = this.reg16[reg_sp];
@ -401,14 +384,14 @@ CPU.prototype.enter16 = function()
this.reg16[reg_sp] -= size;
};
CPU.prototype.enter32 = function()
CPU.prototype.enter32 = function(size, nesting_level)
{
var size = this.read_imm16(),
nesting_level = this.read_imm8() & 31,
frame_temp,
tmp_ebp;
nesting_level &= 31;
//dbg_log("enter32 size=" + size + " nest=" + nesting_level, LOG_CPU);
var frame_temp;
var tmp_ebp;
//dbg_log("enter32 stack=" + (this.stack_size_32 ? 32 : 16) + " size=" + size + " nest=" + nesting_level, LOG_CPU);
this.push32(this.reg32s[reg_ebp]);
frame_temp = this.reg32s[reg_esp];