Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 21:36:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/z80/src/ez80/ez80_vectors.asm: Fix a logic error in vector initialization

Browse Source
This commit is contained in:
Gregory Nutt
2019-06-16 11:47:37 -06:00
parent 7e05bacd54
commit a02858365a
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z80/src/ez80/ez80_vectors.asm
+11 -9
View File
@@ -78,6 +78,7 @@ EZ80_UNUSED EQU 40h
; 1. Disable interrupts ; 1. Disable interrupts
; 2. Dlear mixed memory mode (MADL) flag ; 2. Dlear mixed memory mode (MADL) flag
; 3. jump to initialization procedure with jp.lil to set ADL ; 3. jump to initialization procedure with jp.lil to set ADL
rstvector: macro rstvector: macro
di di
rsmix rsmix
@@ -85,13 +86,14 @@ rstvector: macro
endmac rstvector endmac rstvector
; Define one interrupt handler ; Define one interrupt handler
irqhandler: macro vectno irqhandler: macro vectno
; Save AF on the stack, set the interrupt number and jump to the ; Save AF on the stack, set the interrupt number and jump to the
; common reset handling logic. ; common reset handling logic.
; Offset 8: Return PC is already on the stack ; Offset 8: Return PC is already on the stack
push af ; Offset 7: AF (retaining flags) push af ; Offset 7: AF (retaining flags)
ld a, #vectno ; A = vector number ld a, #vectno ; A = vector number
jp _ez80_rstcommon ; Remaining RST handling is common jp _ez80_rstcommon ; Remaining RST handling is common
endmac irqhandler endmac irqhandler
;************************************************************************** ;**************************************************************************
@@ -208,6 +210,7 @@ _ez80_handlers:
;************************************************************************** ;**************************************************************************
_ez80_rstcommon: _ez80_rstcommon:
; Create a register frame. SP points to top of frame + 4, pushes ; Create a register frame. SP points to top of frame + 4, pushes
; decrement the stack pointer. Already have ; decrement the stack pointer. Already have
; ;
@@ -289,6 +292,7 @@ nointenable:
;************************************************************************** ;**************************************************************************
_ez80_initvectors: _ez80_initvectors:
; Initialize the vector table ; Initialize the vector table
ld iy, _ez80_vectable ld iy, _ez80_vectable
@@ -296,11 +300,7 @@ _ez80_initvectors:
ld bc, 4 ld bc, 4
ld b, NVECTORS ld b, NVECTORS
xor a, a ; Clear carry xor a, a ; Clear carry
ld hl, handlersize ld de, handlersize ; Length of one irq handler in de
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 hl, _ez80_handlers ; Start of handlers in hl
ld a, 0 ld a, 0
@@ -327,6 +327,7 @@ $1:
;************************************************************************** ;**************************************************************************
; Vector Table ; Vector Table
;************************************************************************** ;**************************************************************************
; This segment must be aligned on a 512 byte boundary anywhere in RAM ; This segment must be aligned on a 512 byte boundary anywhere in RAM
; Each entry will be a 3-byte address in a 4-byte space ; Each entry will be a 3-byte address in a 4-byte space
@@ -334,6 +335,7 @@ $1:
segment .IVECTS segment .IVECTS
; The first 64 bytes are not used... the vectors actually start at +0x40 ; The first 64 bytes are not used... the vectors actually start at +0x40
_ez80_vecreserve: _ez80_vecreserve:
ds 64 ds 64
_ez80_vectable: _ez80_vectable: