Verify redesigned Z80 build on native Windows

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5417 42af7a65-404d-4744-a932-0658087f49c3

nuttx/arch/z80/src/Makefile.sdccl

@@ -40,7 +40,6 @@ CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched
 CPPFLAGS += -D__ASSEMBLY__
 
 # Files and directories
-
 # There should be one head source (.asm file)
 
 HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT))
@@ -87,7 +86,7 @@ $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
 $(COBJS): %$(OBJEXT): %.c
 	$(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)
 	$(Q) cp $(SDCC_LIBDIR)/$(SDCCLIB) $(TOPDIR)/lib/$(SDCCLIB)
@@ -139,6 +138,7 @@ board/libboard$(LIBEXT):
 # This target builds the final executable
 
 nuttx.lnk:
+	@echo "LD: nuttx.lnk"
 	@echo "--" >nuttx.lnk						# Non-interactive
 	@echo "-k $(BOARDDIR)" >>nuttx.lnk			# Path to board library
 	@echo "-k $(TOPDIR)/lib" >>nuttx.lnk		# Path to top-level lib directory
@@ -157,18 +157,6 @@ ifneq ($(CONFIG_LINKER_DATA_AREA),)
 else
 	@echo "-b _DATA=0x8000" >>nuttx.lnk			# Start of _DATA area
 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 "-x" >>nuttx.lnk						# Hexadecimal
 	@echo "-m" >>nuttx.lnk						# Generate a map file

nuttx/arch/z80/src/Makefile.sdccw

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

nuttx/arch/z80/src/z80/z80_head.asm

@@ -1,7 +1,7 @@
 ;**************************************************************************
 ; 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>
 ;
 ; Redistribution and use in source and binary forms, with or without
@@ -209,7 +209,7 @@ _up_rstcommon::
 	push	af				; Offset 0: I with interrupt state in parity
 	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
 	add		hl, sp			;
@@ -221,7 +221,7 @@ _up_rstcommon::
 	; 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
 	; 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
 

nuttx/arch/z80/src/z80/z80_rom.asm

@@ -1,7 +1,7 @@
 ;**************************************************************************
 ; 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>
 ;
 ; Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 
 	; 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_DE	==  4		; Offset 2: Saved DE register
 	XCPT_IX	==  6		; Offset 3: Saved IX register
@@ -221,7 +221,7 @@ _up_rstcommon:
 	; Restore registers.  HL points to the beginning of the reg structure to restore
 
 	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
 	pop		bc				; Offset 1: BC
 	pop		de				; Offset 2: DE
@@ -258,10 +258,13 @@ nointenable::
 
 	.area	_HOME
 	.area	_CODE
+	.area	_INITIALIZER
 	.area	_GSINIT
 	.area	_GSFINAL
 
 	.area	_DATA
+	.area	_INITIALIZED
+	.area	_BSEG
 	.area	_BSS
 	.area	_HEAP
 
@@ -271,6 +274,24 @@ nointenable::
 
 	.area	_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
 	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
+