Use the new symbols to clean up the assembler.

--HG--
extra : convert_revision : 005464e875ede1e37dfe0e0482c29fd793ca52be
This commit is contained in:
Gabe Black 2007-06-21 15:30:05 +00:00
parent 13bf022053
commit 25e385e0cf
7 changed files with 84 additions and 107 deletions

View file

@ -56,26 +56,22 @@
microcode = '''
def macroop SUB_R_I
{
subi "env.reg", "env.reg", "IMMEDIATE"
subi reg, reg, imm
};
def macroop SUB_M_I
{
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
subi "NUM_INTREGS+1", "NUM_INTREGS+1", "IMMEDIATE"
st "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
ld t1, ds, [scale, index, base], disp
subi t1, t1, imm
st t1, ds, [scale, index, base], disp
};
def macroop SUB_P_I
{
rdip "NUM_INTREGS+7"
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
subi "NUM_INTREGS+1", "NUM_INTREGS+1", "IMMEDIATE"
st "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
rdip t7
ld t1, ds, [scale, index, base], disp
subi t1, t1, imm
st t1, ds, [scale, index, base], disp
};
'''
#let {{

View file

@ -56,44 +56,40 @@
microcode = '''
def macroop TEST_M_R
{
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
and "NUM_INTREGS", "NUM_INTREGS+1", "env.reg"
ld t1, ds, [scale, index, base], disp
and t0, t1, reg
};
def macroop TEST_P_R
{
rdip "NUM_INTREGS+7"
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
and "NUM_INTREGS", "NUM_INTREGS+1", "env.reg"
rdip t7
ld t1, ds, [scale, index, base], disp
and t0, t1, reg
};
def macroop TEST_R_R
{
and "NUM_INTREGS", "env.reg", "env.regm"
and t0, reg, regm
};
def macroop TEST_M_I
{
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
limm "NUM_INTREGS+2", "IMMEDIATE"
and "NUM_INTREGS", "NUM_INTREGS+1", "NUM_INTREGS+2"
ld t1, ds, [scale, index, base], disp
limm t2, imm
and t0, t1, t2
};
def macroop TEST_P_I
{
rdip "NUM_INTREGS+7"
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
limm "NUM_INTREGS+2", "IMMEDIATE"
and "NUM_INTREGS", "NUM_INTREGS+1", "NUM_INTREGS+2"
rdip t7
ld t1, ds, [scale, index, base], disp
limm t2, imm
and t0, t1, t2
};
def macroop TEST_R_I
{
limm "NUM_INTREGS+1", "IMMEDIATE"
and "NUM_INTREGS", "env.reg", "NUM_INTREGS+1"
limm t1, imm
and t0, reg, t1
};
'''

View file

@ -56,13 +56,14 @@
microcode = '''
def macroop CALL_I
{
.adjust_env "if(machInst.mode.submode == SixtyFourBitMode && env.dataSize == 4) env.dataSize = 8\;"
# Make the default data size of pops 64 bits in 64 bit mode
.adjust_env oszIn64Override
limm "NUM_INTREGS+2", "IMMEDIATE"
rdip "NUM_INTREGS+1"
subi "INTREG_RSP", "INTREG_RSP", "env.dataSize"
st "NUM_INTREGS+1", 2, [0, "NUM_INTREGS", "INTREG_RSP"]
wrip "NUM_INTREGS+1", "NUM_INTREGS+2"
limm t2, imm
rdip t1
subi "INTREG_RSP", "INTREG_RSP", dsz
st t1, ss, [0, t0, "INTREG_RSP"]
wrip t1, t2
};
'''
#let {{

View file

@ -55,59 +55,55 @@
microcode = '''
def macroop MOV_R_R {
mov "env.reg", "env.reg", "env.regm"
mov reg, reg, regm
};
def macroop MOV_M_R {
st "env.reg", 3, ["env.scale", "env.index", "env.base"], "DISPLACEMENT"
st reg, ds, [scale, index, base], disp
};
def macroop MOV_P_R {
rdip "NUM_INTREGS+7"
st "env.reg", 3, ["env.scale", "env.index", "env.base"], "DISPLACEMENT"
rdip t7
st reg, ds, [scale, index, base], disp
};
def macroop MOV_R_M {
ld "env.reg", 3, ["env.scale", "env.index", "env.base"], "DISPLACEMENT"
ld reg, ds, [scale, index, base], disp
};
def macroop MOV_R_P {
rdip "NUM_INTREGS+7"
ld "env.reg", 3, ["env.scale", "env.index", "env.base"], "DISPLACEMENT"
rdip t7
ld reg, ds, [scale, index, base], disp
};
def macroop MOV_R_I {
limm "env.reg", "IMMEDIATE"
limm reg, imm
};
def macroop MOV_M_I {
limm "NUM_INTREGS+1", "IMMEDIATE"
st "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
limm t1, imm
st t1, ds, [scale, index, base], disp
};
def macroop MOV_P_I {
rdip "NUM_INTREGS+7"
limm "NUM_INTREGS+1", "IMMEDIATE"
st "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
rdip t7
limm t1, imm
st t1, ds, [scale, index, base], disp
};
def macroop MOVSXD_R_R {
sext "env.reg", "env.regm", "env.dataSize"
sext reg, regm, dsz
};
def macroop MOVSXD_R_M {
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
sext "env.reg", "NUM_INTREGS+1", "env.dataSize"
ld t1, ds, [scale, index, base], disp
sext reg, t1, dsz
};
def macroop MOVSXD_R_P {
rdip "NUM_INTREGS+7"
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
sext "env.reg", "NUM_INTREGS+1", "env.dataSize"
rdip t7
ld t1, ds, [scale, index, base], disp
sext reg, t1, dsz
};
'''
#let {{

View file

@ -55,21 +55,19 @@
microcode = '''
def macroop POP_R {
# Make the default data size of pops 64 bits in 64 bit mode
.adjust_env "if(machInst.mode.submode == SixtyFourBitMode && env.dataSize == 4) env.dataSize = 8\;"
.adjust_env oszIn64Override
ld "env.reg", 2, [0, "NUM_INTREGS", "INTREG_RSP"]
addi "INTREG_RSP", "INTREG_RSP", "env.dataSize"
ld reg, ss, [0, t0, "INTREG_RSP"]
addi "INTREG_RSP", "INTREG_RSP", dsz
};
def macroop PUSH_R {
# Make the default data size of pops 64 bits in 64 bit mode
.adjust_env "if(machInst.mode.submode == SixtyFourBitMode && env.dataSize == 4) env.dataSize = 8\;"
.adjust_env oszIn64Override
subi "INTREG_RSP", "INTREG_RSP", "env.dataSize"
st "env.reg", 2, [0, "NUM_INTREGS", "INTREG_RSP"]
subi "INTREG_RSP", "INTREG_RSP", dsz
st reg, ss, [0, t0, "INTREG_RSP"]
};
'''
#let {{

View file

@ -55,11 +55,11 @@
microcode = '''
def macroop LEA_R_M {
lea "env.reg", 3, ["env.scale", "env.index", "env.base"], "DISPLACEMENT"
lea reg, ds, [scale, index, base], disp
};
def macroop LEA_R_P {
rdip "NUM_INTREGS+7"
lea "env.reg", 3, ["env.scale", "env.index", "env.base"], "DISPLACEMENT"
rdip t7
lea reg, ds, [scale, index, base], disp
};
'''

View file

@ -56,74 +56,64 @@
microcode = '''
def macroop XOR_R_R
{
xor "env.reg", "env.reg", "env.regm"
xor reg, reg, regm
};
def macroop XOR_R_I
{
limm "NUM_INTREGS+1", "IMMEDIATE"
xor "env.reg", "env.reg", "NUM_INTREGS+1"
limm t1, imm
xor reg, reg, t1
};
def macroop XOR_M_R
{
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
xor "NUM_INTREGS+1", "NUM_INTREGS+1", "env.reg"
st "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
ld t1, ds, [scale, index, base], disp
xor t1, t1, reg
st t1, ds, [scale, index, base], disp
};
def macroop XOR_P_R
{
rdip "NUM_INTREGS+7"
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
xor "NUM_INTREGS+1", "NUM_INTREGS+1", "env.reg"
st "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
rdip t7
ld t1, ds, [scale, index, base], disp
xor t1, t1, reg
st t1, ds, [scale, index, base], disp
};
def macroop XOR_R_M
{
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
xor "env.reg", "env.reg", "NUM_INTREGS+1"
ld t1, ds, [scale, index, base], disp
xor reg, reg, t1
};
def macroop XOR_R_P
{
rdip "NUM_INTREGS+7"
ld "NUM_INTREGS+1", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
xor "env.reg", "env.reg", "NUM_INTREGS+1"
rdip t7
ld t1, ds, [scale, index, base], disp
xor reg, reg, t1
};
def macroop AND_R_I
{
limm "NUM_INTREGS+1", "IMMEDIATE"
and "env.reg", "env.reg", "NUM_INTREGS+1"
limm t1, imm
and reg, reg, t1
};
def macroop AND_M_I
{
ld "NUM_INTREGS+2", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
limm "NUM_INTREGS+1", "IMMEDIATE"
and "NUM_INTREGS+2", "NUM_INTREGS+2", "NUM_INTREGS+1"
st "NUM_INTREGS+2", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
ld t2, ds, [scale, index, base], disp
limm t1, imm
and t2, t2, t1
st t2, ds, [scale, index, base], disp
};
def macroop AND_P_I
{
rdip "NUM_INTREGS+7"
ld "NUM_INTREGS+2", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
limm "NUM_INTREGS+1", "IMMEDIATE"
and "NUM_INTREGS+2", "NUM_INTREGS+2", "NUM_INTREGS+1"
st "NUM_INTREGS+2", 3, ["env.scale", "env.index", "env.base"], \
"DISPLACEMENT"
rdip t7
ld t2, ds, [scale, index, base], disp
limm t1, imm
and t2, t2, t1
st t2, ds, [scale, index, base], disp
};
'''
#let {{