sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ez80Acclaim fixes from Kevin Franzen

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1500 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-02-14 23:57:26 +00:00
parent 7800fc3749
commit 024334302d
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/z80/src/ez80/ez80_vectors.asm
View File

@ -210,7 +210,7 @@ _ez80_rstcommon:
push de ; Offset 2: DE push de ; Offset 2: DE
push bc ; Offset 1: BC push bc ; Offset 1: BC
ld b, a ; Save the reset number in B ld c, a ; Save the reset number in C
ld a, i ; Carry bit holds interrupt state ld a, i ; Carry bit holds interrupt state
push af ; Offset 0: I with interrupt state in carry push af ; Offset 0: I with interrupt state in carry
di di
@ -221,7 +221,6 @@ _ez80_rstcommon:
add hl, sp ; add hl, sp ;
push hl ; Place argument #2 at the top of stack push hl ; Place argument #2 at the top of stack
push bc ; Argument #1 is the Reset number push bc ; Argument #1 is the Reset number
inc sp ; (make byte sized)
call _up_doirq ; Decode the IRQ call _up_doirq ; Decode the IRQ
; On return, HL points to the beginning of the reg structure to restore ; On return, HL points to the beginning of the reg structure to restore
@ -241,9 +240,7 @@ _ez80_rstcommon:
pop ix ; Offset 3: IX pop ix ; Offset 3: IX
pop iy ; Offset 4: IY pop iy ; Offset 4: IY
exx ; Use alternate BC/DE/HL exx ; Use alternate BC/DE/HL
ld hl, #-2 ; Offset of SP to account for ret addr on stack pop hl ; Offset 5: HL' = Stack pointer after return
pop de ; Offset 5: HL' = Stack pointer after return
add hl, de ; HL = Stack pointer value before return
exx ; Restore original BC/DE/HL exx ; Restore original BC/DE/HL
pop hl ; Offset 6: HL pop hl ; Offset 6: HL
pop af ; Offset 7: AF pop af ; Offset 7: AF
@ -273,21 +270,31 @@ _ez80_initvectors:
; Initialize the vector table ; Initialize the vector table
ld iy, _ez80_vectable ld iy, _ez80_vectable
ld ix, 4
ld bc, 4 ld bc, 4
ld b, NVECTORS ld b, NVECTORS
ld hl, _ez80_handlers xor a, a ; Clear carry
ld de, handlersize ld hl, handlersize
ld de, _ez80_handlers
sbc hl, de ; Length of irq handler in hl
ld d, h
ld e, l
ld hl, _ez80_handlers ; Start of handlers in hl
ld a, 0 ld a, 0
$1: $1:
ld (iy), hl ; Store IRQ handler ld (iy), hl ; Store IRQ handler
ld (iy+3), a ; Pad to 4 bytes ld (iy+3), a ; Pad to 4 bytes
add hl, de ; Point to next handler add hl, de ; Point to next handler
add iy, bc ; Point to next entry in vector table push de
djnz $1 ; Loop until all vectors have been written ld de, 4
add iy, de ; Point to next entry in vector table
pop de
djnz $1 ; Loop until all vectors have been written
; Select interrupt mode 2 ; Select interrupt mode 2
im 2 ; Interrupt mode 2 im 2 ; Interrupt mode 2
; Write the address of the vector table into the interrupt vector base ; Write the address of the vector table into the interrupt vector base
@ -304,5 +311,8 @@ $1:
define .IVECTS, space = RAM, align = 200h define .IVECTS, space = RAM, align = 200h
segment .IVECTS segment .IVECTS
; The first 64 bytes are not used... the vectors actually start at +0x40
_ez80_vecreserve:
ds 64
_ez80_vectable: _ez80_vectable:
ds NVECTORS * 4 ds NVECTORS * 4