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

Moved paging functions from Bus to CPU

Browse source
This commit is contained in:
Jeff Parsons 2015-05-05 10:32:04 -07:00 • committed by jeffpar
commit 73086a7ac8
6 changed files with 281 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tests/pc/80386/tests.nasm
View file

@ -1,8 +1,8 @@
cpu 386
;
; This file is designed to run as a ROM replacement, but it has a .COM extension because it's
; also designed to run as a COM file under DOS (hence the "org 0x100").
;
cpu 386
org 0x100
section .text
@ -22,14 +22,14 @@ ACC_TYPE_DATA_WRITABLE equ 0x1200
EXT_BIG equ 0x0040
SEG_CODE_REAL equ 0xf000
SEG_CODE_PROT equ 0x0008
SEG_DATA_PROT equ 0x0010
CSEG_REAL equ 0xf000
CSEG_PROT equ 0x0008
DSEG_PROT equ 0x0010
CR0_MSW_PE equ 0x0001
;
; descDT defines a descriptor, given a base (%1), limit (%2), type (%3), dpl (%4), and bigness (%5)
; descDT defines a descriptor, given a base (%1), limit (%2), type (%3), dpl (%4), and ext (%5)
;
%macro defDesc 1-5 0,0,0,0
dw (%2 & 0x0000ffff)
@ -43,21 +43,20 @@ start: mov eax,0x44332211
mov ecx,0x88776655
mul ecx
div ecx
jnz near goProt
jnz near goProt ; apparently we have to tell NASM "near" because this is a forward reference
times 32768 nop ; lots of NOPs to force a 16-bit conditional jump
times 32768 nop
romGDT: defDesc 0
defDesc 0x000f0000,0x0000ffff,ACC_TYPE_CODE_READABLE,0
defDesc 0x00000000,0x000fffff,ACC_TYPE_DATA_WRITABLE,0
romGDT: defDesc 0 ; the first descriptor in any descriptor table is always a dud (it corresponds to the null descriptor)
defDesc 0x000f0000,0x0000ffff,ACC_TYPE_CODE_READABLE
defDesc 0x00000000,0x000fffff,ACC_TYPE_DATA_WRITABLE
goProt: lgdt [cs:romGDT]
mov eax,cr0
or eax,CR0_MSW_PE
mov cr0,eax
jmp dword SEG_CODE_PROT:inProt
jmp dword CSEG_PROT:inProt
inProt: mov ax,SEG_DATA_PROT
inProt: mov ax,DSEG_PROT
mov ds,ax
;
; Do some protected-mode tests...
@ -66,20 +65,19 @@ inProt: mov ax,SEG_DATA_PROT
goReal: mov eax,cr0
and eax,~CR0_MSW_PE
mov cr0,eax
jmp dword SEG_CODE_REAL:inReal
jmp dword CSEG_REAL:inReal
inReal: or eax,1
jnz start
jnz start ; apparently we do NOT have to say "near" here since this is a backward reference
;
; Fill the remaining space with NOPs until we get to target offset 0xFFF0.
;
; Note that we subtract 0x100 from the target offset because we're ORG'ed at 0x100.
;
times 0xfff0-0x100-($-$$) nop
bits 16
jmp SEG_CODE_REAL:start
jmp CSEG_REAL:start
db 0x20
db '04/04/15'