Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More instruction tests

Browse source
This commit is contained in:
Jeff Parsons 2015-10-16 12:03:21 -07:00
commit 96d73bab99
2 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tests/pc/80386/test386.nasm
View file

@ -510,7 +510,7 @@ testOps:
test ecx,ecx ; (must use JZ since there's no long version of JECXZ) test ecx,ecx ; (must use JZ since there's no long version of JECXZ)
jz near testDone ; zero means we've reached the end of the table jz near testDone ; zero means we've reached the end of the table
movzx ebx,byte [cs:esi+1] ; EBX == TYPE movzx ebx,byte [cs:esi+1] ; EBX == TYPE
shl ebx,5 ; EBX == TYPE * 32 shl ebx,6 ; EBX == TYPE * 64
movzx edx,byte [cs:esi+2] ; EDX == SIZE movzx edx,byte [cs:esi+2] ; EDX == SIZE
shl edx,4 ; EDX == SIZE * 16 shl edx,4 ; EDX == SIZE * 16
lea ebx,[cs:typeValues+ebx+edx] ; EBX -> values for type lea ebx,[cs:typeValues+ebx+edx] ; EBX -> values for type
@ -719,6 +719,7 @@ printVal:
ret ret
TYPE_ARITH equ 0 TYPE_ARITH equ 0
TYPE_LOGIC equ 1
SIZE_BYTE equ 0 SIZE_BYTE equ 0
SIZE_SHORT equ 1 SIZE_SHORT equ 1
@ -748,12 +749,34 @@ tableOps:
defOp "ADD",add,al,dl,TYPE_ARITH defOp "ADD",add,al,dl,TYPE_ARITH
defOp "ADD",add,ax,dx,TYPE_ARITH defOp "ADD",add,ax,dx,TYPE_ARITH
defOp "ADD",add,eax,edx,TYPE_ARITH defOp "ADD",add,eax,edx,TYPE_ARITH
defOp "OR",or,al,dl,TYPE_LOGIC
defOp "OR",or,ax,dx,TYPE_LOGIC
defOp "OR",or,eax,edx,TYPE_LOGIC
defOp "ADC",adc,al,dl,TYPE_ARITH
defOp "ADC",adc,ax,dx,TYPE_ARITH
defOp "ADC",adc,eax,edx,TYPE_ARITH
defOp "SBB",sbb,al,dl,TYPE_ARITH
defOp "SBB",sbb,ax,dx,TYPE_ARITH
defOp "SBB",sbb,eax,edx,TYPE_ARITH
defOp "AND",and,al,dl,TYPE_LOGIC
defOp "AND",and,ax,dx,TYPE_LOGIC
defOp "AND",and,eax,edx,TYPE_LOGIC
defOp "SUB",sub,al,dl,TYPE_ARITH
defOp "SUB",sub,ax,dx,TYPE_ARITH
defOp "SUB",sub,eax,edx,TYPE_ARITH
defOp "XOR",xor,al,dl,TYPE_LOGIC
defOp "XOR",xor,ax,dx,TYPE_LOGIC
defOp "XOR",xor,eax,edx,TYPE_LOGIC
defOp "CMP",cmp,al,dl,TYPE_ARITH
defOp "CMP",cmp,ax,dx,TYPE_ARITH
defOp "CMP",cmp,eax,edx,TYPE_ARITH
db 0 db 0
align 4 align 4
typeMasks: typeMasks:
dd PS_ARITH dd PS_ARITH
dd PS_LOGIC
arithValues: arithValues:
.bvals: dd 0x00,0x01,0x02,0x7E,0x7F,0x80,0x81,0xFE,0xFF .bvals: dd 0x00,0x01,0x02,0x7E,0x7F,0x80,0x81,0xFE,0xFF
@ -766,10 +789,20 @@ arithValues:
ARITH_DWORDS equ ($-.dvals)/4 ARITH_DWORDS equ ($-.dvals)/4
typeValues: typeValues:
;
; Values for TYPE_ARITH
;
dd ARITH_BYTES,arithValues,ARITH_BYTES,arithValues dd ARITH_BYTES,arithValues,ARITH_BYTES,arithValues
dd ARITH_BYTES+ARITH_WORDS,arithValues,ARITH_BYTES+ARITH_WORDS,arithValues dd ARITH_BYTES+ARITH_WORDS,arithValues,ARITH_BYTES+ARITH_WORDS,arithValues
dd ARITH_BYTES+ARITH_WORDS+ARITH_DWORDS,arithValues,ARITH_BYTES+ARITH_WORDS+ARITH_DWORDS,arithValues dd ARITH_BYTES+ARITH_WORDS+ARITH_DWORDS,arithValues,ARITH_BYTES+ARITH_WORDS+ARITH_DWORDS,arithValues
dd 0,0 dd 0,0,0,0
;
; Values for TYPE_LOGIC (I'm using ARITH values for now)
;
dd ARITH_BYTES,arithValues,ARITH_BYTES,arithValues
dd ARITH_BYTES+ARITH_WORDS,arithValues,ARITH_BYTES+ARITH_WORDS,arithValues
dd ARITH_BYTES+ARITH_WORDS+ARITH_DWORDS,arithValues,ARITH_BYTES+ARITH_WORDS+ARITH_DWORDS,arithValues
dd 0,0,0,0
error: jmp error error: jmp error

1
tests/pc/inc/x86.inc
View file

@ -11,6 +11,7 @@ PS_IF equ 0x0200
PS_DF equ 0x0400 PS_DF equ 0x0400
PS_OF equ 0x0800 PS_OF equ 0x0800
PS_ARITH equ (PS_CF | PS_PF | PS_AF | PS_ZF | PS_SF | PS_OF) PS_ARITH equ (PS_CF | PS_PF | PS_AF | PS_ZF | PS_SF | PS_OF)
PS_LOGIC equ (PS_CF | PS_PF | PS_ZF | PS_SF | PS_OF)
CR0_MSW_PE equ 0x0001 CR0_MSW_PE equ 0x0001
CR0_PG equ 0x80000000 ; set if paging enabled CR0_PG equ 0x80000000 ; set if paging enabled