Verify redesigned Z80 build on native Windows

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5417 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-12-07 20:45:07 +00:00
parent 080210ec99
commit 3cda2d7874
4 changed files with 214 additions and 208 deletions

View File

@ -40,7 +40,6 @@ CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched
CPPFLAGS += -D__ASSEMBLY__ CPPFLAGS += -D__ASSEMBLY__
# Files and directories # Files and directories
# There should be one head source (.asm file) # There should be one head source (.asm file)
HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT)) HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT))
@ -87,7 +86,7 @@ $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
$(COBJS): %$(OBJEXT): %.c $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
# This is a kludge to work around some conflicting symbols in libsdcc.lib # This is a kludge to work around some conflicting symbols in the SDCC libraries
$(TOPDIR)/lib/$(SDCCLIB): $(SDCC_LIBDIR)/$(SDCCLIB) $(TOPDIR)/lib/$(SDCCLIB): $(SDCC_LIBDIR)/$(SDCCLIB)
$(Q) cp $(SDCC_LIBDIR)/$(SDCCLIB) $(TOPDIR)/lib/$(SDCCLIB) $(Q) cp $(SDCC_LIBDIR)/$(SDCCLIB) $(TOPDIR)/lib/$(SDCCLIB)
@ -123,8 +122,8 @@ $(TOPDIR)/lib/$(SDCCLIB): $(SDCC_LIBDIR)/$(SDCCLIB)
# IDLE thread stack # IDLE thread stack
asm_mem.h: asm_mem.h:
@echo " CONFIG_STACK_END == ($(CONFIG_DRAM_SIZE) - 1)" >> asm_mem.h @echo " CONFIG_STACK_END == ($(CONFIG_DRAM_SIZE) - 1)" >> asm_mem.h
@echo " CONFIG_STACK_BASE == (CONFIG_STACK_END - $(CONFIG_IDLETHREAD_STACKSIZE))" >> asm_mem.h @echo " CONFIG_STACK_BASE == (CONFIG_STACK_END - $(CONFIG_IDLETHREAD_STACKSIZE))" >> asm_mem.h
# Combine all objects in this directory into a library # Combine all objects in this directory into a library
@ -139,6 +138,7 @@ board/libboard$(LIBEXT):
# This target builds the final executable # This target builds the final executable
nuttx.lnk: nuttx.lnk:
@echo "LD: nuttx.lnk"
@echo "--" >nuttx.lnk # Non-interactive @echo "--" >nuttx.lnk # Non-interactive
@echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library @echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library
@echo "-k $(TOPDIR)/lib" >>nuttx.lnk # Path to top-level lib directory @echo "-k $(TOPDIR)/lib" >>nuttx.lnk # Path to top-level lib directory
@ -157,18 +157,6 @@ ifneq ($(CONFIG_LINKER_DATA_AREA),)
else else
@echo "-b _DATA=0x8000" >>nuttx.lnk # Start of _DATA area @echo "-b _DATA=0x8000" >>nuttx.lnk # Start of _DATA area
endif endif
ifneq ($(CONFIG_LINKER_START_AREA),)
@echo "-b START=$(CONFIG_LINKER_START_AREA)" >>nuttx.lnk # Start of START area
endif
ifneq ($(CONFIG_LINKER_CODE_AREA),)
@echo "-b _CODE=$(CONFIG_LINKER_CODE_AREA)" >>nuttx.lnk # Start of _CODE area
else
@echo "-b _CODE=256" >>nuttx.lnk # Start of _CODE area
endif
ifneq ($(CONFIG_LINKER_DATA_AREA),)
@echo "-b _CODE=$(CONFIG_LINKER_DATA_AREA)" >>nuttx.lnk
endif
@echo "-i" >>nuttx.lnk # Intel hex format @echo "-i" >>nuttx.lnk # Intel hex format
@echo "-x" >>nuttx.lnk # Hexadecimal @echo "-x" >>nuttx.lnk # Hexadecimal
@echo "-m" >>nuttx.lnk # Generate a map file @echo "-m" >>nuttx.lnk # Generate a map file

View File

@ -145,18 +145,15 @@ nuttx.lnk:
@echo -l libboard$(LIBEXT)>>nuttx.lnk @echo -l libboard$(LIBEXT)>>nuttx.lnk
$(Q) for %%G in ($(LINKLIBS)) do ( echo -l $(TOPDIR)\lib\%%G>> nuttx.lnk ) $(Q) for %%G in ($(LINKLIBS)) do ( echo -l $(TOPDIR)\lib\%%G>> nuttx.lnk )
@echo -l $(SDCCLIB)>>nuttx.lnk @echo -l $(SDCCLIB)>>nuttx.lnk
ifneq ($(CONFIG_LINKER_START_AREA),)
@echo -b START=$(CONFIG_LINKER_START_AREA)>>nuttx.lnk
else
@echo -b START=0>>nuttx.lnk
endif
ifneq ($(CONFIG_LINKER_CODE_AREA),) ifneq ($(CONFIG_LINKER_CODE_AREA),)
@echo -b _CODE=$(CONFIG_LINKER_CODE_AREA)>>nuttx.lnk @echo -b _CODE=$(CONFIG_LINKER_CODE_AREA)>>nuttx.lnk
else else
@echo -b _CODE=256>>nuttx.lnk @echo -b _CODE=0x0200>>nuttx.lnk
endif endif
ifneq ($(CONFIG_LINKER_DATA_AREA),) ifneq ($(CONFIG_LINKER_DATA_AREA),)
@echo -b _CODE=$(CONFIG_LINKER_DATA_AREA)>>nuttx.lnk @echo -b _CODE=$(CONFIG_LINKER_DATA_AREA)>>nuttx.lnk
else
@echo -b _DATA=0x8000>>nuttx.lnk
endif endif
@echo -i>>nuttx.lnk @echo -i>>nuttx.lnk
@echo -x>>nuttx.lnk @echo -x>>nuttx.lnk

View File

@ -1,7 +1,7 @@
;************************************************************************** ;**************************************************************************
; arch/z80/src/z80/z80_head.asm ; arch/z80/src/z80/z80_head.asm
; ;
; Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. ; Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
; Author: Gregory Nutt <gnutt@nuttx.org> ; Author: Gregory Nutt <gnutt@nuttx.org>
; ;
; Redistribution and use in source and binary forms, with or without ; Redistribution and use in source and binary forms, with or without
@ -92,70 +92,70 @@
; 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, #1 ; 1 = Z80_RST1 ld a, #1 ; 1 = Z80_RST1
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
.org 0x0010 ; RST 2 .org 0x0010 ; RST 2
; 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, #2 ; 2 = Z80_RST2 ld a, #2 ; 2 = Z80_RST2
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
.org 0x0018 ; RST 3 .org 0x0018 ; RST 3
; 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, #3 ; 1 = Z80_RST3 ld a, #3 ; 1 = Z80_RST3
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
.org 0x0020 ; RST 4 .org 0x0020 ; RST 4
; 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, #4 ; 1 = Z80_RST4 ld a, #4 ; 1 = Z80_RST4
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
.org 0x0028 ; RST 5 .org 0x0028 ; RST 5
; 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, #5 ; 1 = Z80_RST5 ld a, #5 ; 1 = Z80_RST5
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
.org 0x0030 ; RST 6 .org 0x0030 ; RST 6
; 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, #6 ; 1 = Z80_RST6 ld a, #6 ; 1 = Z80_RST6
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
.org 0x0038 ; Int mode 1 / RST 7 .org 0x0038 ; Int mode 1 / RST 7
; 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, #7 ; 7 = Z80_RST7 ld a, #7 ; 7 = Z80_RST7
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
;************************************************************************** ;**************************************************************************
; NMI interrupt handler ; NMI interrupt handler
;************************************************************************** ;**************************************************************************
.org 0x0066 .org 0x0066
retn retn
;************************************************************************** ;**************************************************************************
@ -166,7 +166,7 @@ _up_reset:
; Set up the stack pointer at the location determined the Makefile ; Set up the stack pointer at the location determined the Makefile
; and stored in asm_mem.h ; and stored in asm_mem.h
ld SP, #CONFIG_STACK_END ; Set stack pointer ld SP, #CONFIG_STACK_END ; Set stack pointer
; Performed initialization unique to the SDCC toolchain ; Performed initialization unique to the SDCC toolchain
@ -179,8 +179,8 @@ _up_reset:
; NuttX will never return, but just in case... ; NuttX will never return, but just in case...
_up_halt:: _up_halt::
halt ; We should never get here halt ; We should never get here
jp _up_halt jp _up_halt
;************************************************************************** ;**************************************************************************
; Common Interrupt handler ; Common Interrupt handler
@ -195,98 +195,98 @@ _up_rstcommon::
; ;
; IRQ number is in A ; IRQ number is in A
push hl ; Offset 6: HL push hl ; Offset 6: HL
ld hl, #(3*2) ; HL is the value of the stack pointer before ld hl, #(3*2) ; HL is the value of the stack pointer before
add hl, sp ; the interrupt occurred add hl, sp ; the interrupt occurred
push hl ; Offset 5: Stack pointer push hl ; Offset 5: Stack pointer
push iy ; Offset 4: IY push iy ; Offset 4: IY
push ix ; Offset 3: IX push ix ; Offset 3: IX
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 b, a ; Save the reset number in B
ld a, i ; Parity bit holds interrupt state ld a, i ; Parity bit holds interrupt state
push af ; Offset 0: I with interrupt state in parity push af ; Offset 0: I with interrupt state in parity
di di
; Call the interrupt decode logic. SP points to the beggining of the reg structure ; Call the interrupt decode logic. SP points to the beginning of the reg structure
ld hl, #0 ; Argument #2 is the beginning of the reg structure ld hl, #0 ; Argument #2 is the beginning of the reg structure
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) 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
; Note that (1) the arguments pushed on the stack are not popped, and (2) the ; Note that (1) the arguments pushed on the stack are not popped, and (2) the
; original stack pointer is lost. In the normal case (no context switch), ; original stack pointer is lost. In the normal case (no context switch),
; HL will contain the value of the SP before the arguments wer pushed. ; HL will contain the value of the SP before the arguments were pushed.
ld sp, hl ; Use the new stack pointer ld sp, hl ; Use the new stack pointer
; Restore registers. HL points to the beginning of the reg structure to restore ; Restore registers. HL points to the beginning of the reg structure to restore
ex af, af' ; Select alternate AF ex af, af' ; Select alternate AF
pop af ; Offset 0: AF' = I with interrupt state in carry pop af ; Offset 0: AF' = I with interrupt state in carry
ex af, af' ; Restore original AF ex af, af' ; Restore original AF
pop bc ; Offset 1: BC pop bc ; Offset 1: BC
pop de ; Offset 2: DE pop de ; Offset 2: DE
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 ld hl, #-2 ; Offset of SP to account for ret addr on stack
pop de ; 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 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
; Restore the stack pointer ; Restore the stack pointer
exx ; Use alternate BC/DE/HL exx ; Use alternate BC/DE/HL
ld sp, hl ; Set SP = saved stack pointer value before return ld sp, hl ; Set SP = saved stack pointer value before return
exx ; Restore original BC/DE/HL exx ; Restore original BC/DE/HL
; Restore interrupt state ; Restore interrupt state
ex af, af' ; Recover interrupt state ex af, af' ; Recover interrupt state
jp po, nointenable ; Odd parity, IFF2=0, means disabled jp po, nointenable ; Odd parity, IFF2=0, means disabled
ex af, af' ; Restore AF (before enabling interrupts) ex af, af' ; Restore AF (before enabling interrupts)
ei ; yes ei ; yes
reti reti
nointenable:: nointenable::
ex af, af' ; Restore AF ex af, af' ; Restore AF
reti reti
;************************************************************************** ;**************************************************************************
; Ordering of segments for the linker (SDCC only) ; Ordering of segments for the linker (SDCC only)
;************************************************************************** ;**************************************************************************
.area _HOME .area _HOME
.area _CODE .area _CODE
.area _INITIALIZER .area _INITIALIZER
.area _GSINIT .area _GSINIT
.area _GSFINAL .area _GSFINAL
.area _DATA .area _DATA
.area _INITIALIZED .area _INITIALIZED
.area _BSEG .area _BSEG
.area _BSS .area _BSS
.area _HEAP .area _HEAP
;************************************************************************** ;**************************************************************************
; Global data initialization logic (SDCC only) ; Global data initialization logic (SDCC only)
;************************************************************************** ;**************************************************************************
.area _GSINIT .area _GSINIT
gsinit:: gsinit::
ld bc, #l__INITIALIZER ld bc, #l__INITIALIZER
ld a, b ld a, b
or a, c or a, c
jr Z, gsinit_next jr Z, gsinit_next
ld de, #s__INITIALIZED ld de, #s__INITIALIZED
ld hl, #s__INITIALIZER ld hl, #s__INITIALIZER
ldir ldir
gsinit_next: gsinit_next:
@ -300,5 +300,5 @@ gsinit_next:
.area _CODE .area _CODE
_g_heapbase:: _g_heapbase::
.dw #s__HEAP .dw #s__HEAP

View File

@ -1,7 +1,7 @@
;************************************************************************** ;**************************************************************************
; arch/z80/src/z80/z80_rom.asm ; arch/z80/src/z80/z80_rom.asm
; ;
; Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. ; Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
; Author: Gregory Nutt <gnutt@nuttx.org> ; Author: Gregory Nutt <gnutt@nuttx.org>
; ;
; Redistribution and use in source and binary forms, with or without ; Redistribution and use in source and binary forms, with or without
@ -42,7 +42,7 @@
; Register save area layout ; Register save area layout
XCPT_I == 0 ; Offset 0: Saved I w/interrupt state in parity XCPT_I == 0 ; Offset 0: Saved I w/interrupt state in carry
XCPT_BC == 2 ; Offset 1: Saved BC register XCPT_BC == 2 ; Offset 1: Saved BC register
XCPT_DE == 4 ; Offset 2: Saved DE register XCPT_DE == 4 ; Offset 2: Saved DE register
XCPT_IX == 6 ; Offset 3: Saved IX register XCPT_IX == 6 ; Offset 3: Saved IX register
@ -71,7 +71,7 @@ _up_reset:
; Set up the stack pointer at the location determined the Makefile ; Set up the stack pointer at the location determined the Makefile
; and stored in asm_mem.h ; and stored in asm_mem.h
ld SP, #CONFIG_STACK_END ; Set stack pointer ld SP, #CONFIG_STACK_END ; Set stack pointer
; Performed initialization unique to the SDCC toolchain ; Performed initialization unique to the SDCC toolchain
@ -79,9 +79,9 @@ _up_reset:
; Copy the reset vectors ; Copy the reset vectors
ld hl, #_up_rstvectors ; code for RAM ld hl, #_up_rstvectors ; code for RAM
ld de, #0x4000 ; move it here ld de, #0x4000 ; move it here
ld bc, #3*7 ; 7 vectors / 3 bytes each ld bc, #3*7 ; 7 vectors / 3 bytes each
ldir ldir
; Then start NuttX ; Then start NuttX
@ -91,19 +91,19 @@ _up_reset:
; NuttX will never return, but just in case... ; NuttX will never return, but just in case...
_up_halt:: _up_halt::
halt ; We should never get here halt ; We should never get here
jp _up_halt jp _up_halt
; Data to copy to address 0x4000 ; Data to copy to address 0x4000
_up_rstvectors: _up_rstvectors:
jp _up_rst1 ; 0x4000 : RST 1 jp _up_rst1 ; 0x4000 : RST 1
jp _up_rst2 ; 0x4003 : RST 2 jp _up_rst2 ; 0x4003 : RST 2
jp _up_rst3 ; 0x4006 : RST 3 jp _up_rst3 ; 0x4006 : RST 3
jp _up_rst4 ; 0x4009 : RST 4 jp _up_rst4 ; 0x4009 : RST 4
jp _up_rst5 ; 0x400c : RST 5 jp _up_rst5 ; 0x400c : RST 5
jp _up_rst6 ; 0x400f : RST 6 jp _up_rst6 ; 0x400f : RST 6
jp _up_rst7 ; 0x4012 : RST 7 jp _up_rst7 ; 0x4012 : RST 7
;************************************************************************** ;**************************************************************************
; Other reset handlers ; Other reset handlers
@ -119,61 +119,61 @@ _up_rstvectors:
; ;
;************************************************************************** ;**************************************************************************
_up_rst1: ; RST 1 _up_rst1: ; RST 1
; 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, #1 ; 1 = Z80_RST1 ld a, #1 ; 1 = Z80_RST1
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
_up_rst2: ; RST 2 _up_rst2: ; RST 2
; 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, #2 ; 2 = Z80_RST2 ld a, #2 ; 2 = Z80_RST2
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
_up_rst3: ; RST 3 _up_rst3: ; RST 3
; 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, #3 ; 1 = Z80_RST3 ld a, #3 ; 1 = Z80_RST3
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
_up_rst4: ; RST 4 _up_rst4: ; RST 4
; 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, #4 ; 1 = Z80_RST4 ld a, #4 ; 1 = Z80_RST4
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
_up_rst5: ; RST 5 _up_rst5: ; RST 5
; 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, #5 ; 1 = Z80_RST5 ld a, #5 ; 1 = Z80_RST5
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
_up_rst6: ; RST 6 _up_rst6: ; RST 6
; 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, #6 ; 1 = Z80_RST6 ld a, #6 ; 1 = Z80_RST6
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
_up_rst7: ; RST 7 _up_rst7: ; RST 7
; 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, #7 ; 7 = Z80_RST7 ld a, #7 ; 7 = Z80_RST7
jr _up_rstcommon ; Remaining RST handling is common jr _up_rstcommon ; Remaining RST handling is common
;************************************************************************** ;**************************************************************************
; Common Interrupt handler ; Common Interrupt handler
@ -188,27 +188,27 @@ _up_rstcommon:
; ;
; IRQ number is in A ; IRQ number is in A
push hl ; Offset 6: HL push hl ; Offset 6: HL
ld hl, #(3*2) ; HL is the value of the stack pointer before ld hl, #(3*2) ; HL is the value of the stack pointer before
add hl, sp ; the interrupt occurred add hl, sp ; the interrupt occurred
push hl ; Offset 5: Stack pointer push hl ; Offset 5: Stack pointer
push iy ; Offset 4: IY push iy ; Offset 4: IY
push ix ; Offset 3: IX push ix ; Offset 3: IX
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 b, a ; Save the reset number in B
ld a, i ; Parity bit holds interrupt state ld a, i ; Parity bit holds interrupt state
push af ; Offset 0: I with interrupt state in parity push af ; Offset 0: I with interrupt state in parity
di di
; Call the interrupt decode logic. SP points to the beginning of the reg structure ; Call the interrupt decode logic. SP points to the beginning of the reg structure
ld hl, #0 ; Argument #2 is the beginning of the reg structure ld hl, #0 ; Argument #2 is the beginning of the reg structure
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) 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
@ -216,61 +216,82 @@ _up_rstcommon:
; original stack pointer is lost. In the normal case (no context switch), ; original stack pointer is lost. In the normal case (no context switch),
; HL will contain the value of the SP before the arguments were pushed. ; HL will contain the value of the SP before the arguments were pushed.
ld sp, hl ; Use the new stack pointer ld sp, hl ; Use the new stack pointer
; Restore registers. HL points to the beginning of the reg structure to restore ; Restore registers. HL points to the beginning of the reg structure to restore
ex af, af' ; Select alternate AF ex af, af' ; Select alternate AF
pop af ; Offset 0: AF' = I with interrupt state in parity pop af ; Offset 0: AF' = I with interrupt state in carry
ex af, af' ; Restore original AF ex af, af' ; Restore original AF
pop bc ; Offset 1: BC pop bc ; Offset 1: BC
pop de ; Offset 2: DE pop de ; Offset 2: DE
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 ld hl, #-2 ; Offset of SP to account for ret addr on stack
pop de ; 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 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
; Restore the stack pointer ; Restore the stack pointer
exx ; Use alternate BC/DE/HL exx ; Use alternate BC/DE/HL
ld sp, hl ; Set SP = saved stack pointer value before return ld sp, hl ; Set SP = saved stack pointer value before return
exx ; Restore original BC/DE/HL exx ; Restore original BC/DE/HL
; Restore interrupt state ; Restore interrupt state
ex af, af' ; Recover interrupt state ex af, af' ; Recover interrupt state
jp po, nointenable ; Odd parity, IFF2=0, means disabled jp po, nointenable ; Odd parity, IFF2=0, means disabled
ex af, af' ; Restore AF (before enabling interrupts) ex af, af' ; Restore AF (before enabling interrupts)
ei ; yes ei ; yes
reti reti
nointenable:: nointenable::
ex af, af' ; Restore AF ex af, af' ; Restore AF
reti reti
;************************************************************************** ;**************************************************************************
; Ordering of segments for the linker (SDCC only) ; Ordering of segments for the linker (SDCC only)
;************************************************************************** ;**************************************************************************
.area _HOME .area _HOME
.area _CODE .area _CODE
.area _GSINIT .area _INITIALIZER
.area _GSFINAL .area _GSINIT
.area _GSFINAL
.area _DATA .area _DATA
.area _BSS .area _INITIALIZED
.area _HEAP .area _BSEG
.area _BSS
.area _HEAP
;************************************************************************** ;**************************************************************************
; Global data initialization logic (SDCC only) ; Global data initialization logic (SDCC only)
;************************************************************************** ;**************************************************************************
.area _GSINIT .area _GSINIT
gsinit:: gsinit::
ld bc, #l__INITIALIZER
ld a, b
or a, c
jr Z, gsinit_next
ld de, #s__INITIALIZED
ld hl, #s__INITIALIZER
ldir
gsinit_next:
.area _GSFINAL .area _GSFINAL
ret ret
;**************************************************************************
; The start of the heap (SDCC only). Note that is actually resides in
; the _CODE area (which may be FLASH or ROM)
;**************************************************************************
.area _CODE
_g_heapbase::
.dw #s__HEAP