Made it so we can now specify which routines we want

+ Also fixed di :P

Author: mateoconlechuga

CEdev/bin/main_makefile

@@ -94,7 +94,12 @@ endif
 #Define the nesassary headers, along with any the user may have defined, where modification should just trigger a build
 USERHEADERS := $(call WINPATH,$(foreach dir,$(ALLDIRS),$(wildcard $(dir)*.h)))
 HEADERS := $(subst $(space),;,$(call WINPATH,. $(ALLDIRS) $(addprefix $(CEDEV)/,. include include/asm include/lib/ce include/lib/std $(LIBLOC))))
-LIBRARIES := $(call WINPATH,$(addprefix $(CEDEV)/lib/std/,ce/ctice.lib ce/cdebug.lib chelp.lib crt.lib crtS.lib nokernel.lib fplib.lib fplibS.lib))
+LIBRARIES := $(call WINPATH,$(addprefix $(CEDEV)/lib/std/,ce/ctice.lib ce/cdebug.lib chelp.lib crt.lib))
+ifneq ($(USE_FLASH_FUNCTIONS),NO)
+LIBRARIES += $(call WINPATH,$(addprefix $(CEDEV)/lib/std/,crt_linked.lib))
+else
+LIBRARIES += $(call WINPATH,$(addprefix $(CEDEV)/lib/std/,crt_static.lib))
+endif
 LIBRARIES += $(call WINPATH,$(foreach var,$(L),$(CEDEV)/lib/ce/$(var)/$(var).lib))
 
 #Define the assembler flags used by the Zilog assembler

CEdev/examples/template/Makefile

@@ -39,4 +39,10 @@ STACK_HIGH := D1A87E
 INIT_LOC := D1A87F
 #----------------------------
 
+#Use the (slower) OS embedded functions (Advanced)
+
+#----------------------------
+USE_FLASH_FUNCTIONS ?= YES
+#----------------------------
+
 include $(CEDEV)/bin/main_makefile

CEdev/include/asm/cstartup.asm

@@ -41,8 +41,8 @@ _init:
 ;-------------------------------------------------------------------------------
 	segment .startup
 
-	di
 	call	0020848h	; _RunInicOff
+	di
 	ld	hl,__low_bss
 	ld	bc,010DE2h      ; maximum size of BSS+Heap
 	call	00210DCh        ; _MemClear

CEdev/lib/src/buildall.bat

@@ -4,31 +4,37 @@ REM ----------------------------------------------------
 REM  Batch file to build all runtime libraries 
 REM 
 REM  (c) Zilog, Inc.
-REM  Modified by Matt Waltz for CE support
+REM  Modified by Matt "MateoConLechuga" Waltz for CE support
 REM ----------------------------------------------------
 
 REM +--Setting environment variables-------------------+
+
+set SRC=.
 set BIN=%CEDEV%\bin
 set INC=%CEDEV%\include
 set LIBPATH=%CEDEV%\lib
-set SRC=.
+set SHARED_PATH=std\shared
+set STATIC_PATH=std\static
+set LINKED_PATH=std\linked
+set CE_PATH=ce
 
 set ASM=%BIN%\ez80asm.exe
 set CC=%BIN%\eZ80cc.exe
 set LIB=%BIN%\ez80lib.exe
 
-set RTL_C_SRC=bsearch.c maptab.c modf.c qsort.c strtod.c strtol.c strtoul.c ufltinfo.c ufltrnd.c ureverse.c
-set RTL_ST_C_SRC=uitoa.c ultoa.c ustoa.c uuitoa.c uultoa.c uustoa.c vsprintf.c
+REM -- Static and linked hold the same file names --
 
-set RTL_NOKERNEL_C_SRC=free.c malloc.c realloc.c
-set RTL_ASM_SRC=atoi.asm atol.asm atos.asm abs.asm calloc.asm isalnum.asm isalpha.asm iscntrl.asm isdigit.asm isgraph.asm islower.asm isprint.asm ispunct.asm isspace.asm isupper.asm isxdigit.asm isascii.asm labs.asm sprintf.asm strtok.asm longjmp.asm memchr.asm memcmp.asm memcpy.asm memmove.asm memset.asm sbrk.asm setjmp.asm strcat.asm strchr.asm strcmp.asm strcpy.asm strcspn.asm strlen.asm strncat.asm strncmp.asm strncpy.asm strpbrk.asm strrchr.asm strspn.asm strstr.asm div.asm ldiv.asm tolower.asm toupper.asm strncasecmp.asm srand.asm rand.asm strdup.asm
+set RTL_STATIC_C_SRC=asin.c atan.c atan2.c exp.c floor.c fmod.c frexp.c ldexp.c log.c log10.c modf.c pow.c sin.c sinh.c sqrt.c strtod.c tan.c tanh.c ufltinfo.c ufltrnd.c
+set RTL_STATIC_ASM_SRC=acos.asm atof.asm ceil.asm cos.asm fabs.asm isalnum.asm isalpha.asm iscntrl.asm isdigit.asm isgraph.asm islower.asm isprint.asm ispunct.asm isspace.asm isupper.asm isxdigit.asm
 
-set HLP_C_SRC=
-set HLP_ASM_SRC=bdivs.asm bdivu.asm bldix.asm bldiy.asm bmuls.asm brems.asm bremu.asm bshl.asm bshrs.asm bshru.asm bstix.asm bstiy.asm case.asm iand.asm idivs.asm idivu.asm ildix.asm ildiy.asm imulu.asm indcall.asm ineg.asm inot.asm ior.asm irems.asm iremu.asm ishl.asm ishrs.asm ishru.asm istix.asm istiy.asm itol.asm ixor.asm ladd.asm land.asm lcmpu.asm lcmps.asm ldivs.asm ldivu.asm lldix.asm lldiy.asm lmulu.asm lmuls.asm lneg.asm lnot.asm lor.asm lrems.asm lremu.asm lshl.asm lshrs.asm lshru.asm lstix.asm lstiy.asm lsub.asm lxor.asm sand.asm sdivs.asm sdivu.asm sldix.asm sldiy.asm smulu.asm sneg.asm snot.asm sor.asm srems.asm sremu.asm sshl.asm sshrs.asm sshru.asm sstix.asm sstiy.asm stoi.asm stoiu.asm sxor.asm frbmuls.asm frbtof.asm frftob.asm frftoi.asm frftos.asm frftoub.asm frftoui.asm frftous.asm frimuls.asm frimulu.asm fritof.asm frsmuls.asm frsmulu.asm frstof.asm frubtof.asm fruitof.asm frustof.asm frameset0.asm frameset.asm setflag.asm scmpzero.asm icmpzero.asm lcmpzero.asm seqcase.asm seqcaseD.asm case24.asm case24D.asm case16.asm case16D.asm case8.asm case8D.asm
+set RTL_LINKED_C_SRC=
+set RTL_LINKED_ASM_SRC=acos.asm asin.asm atan.asm atan2.asm atof.asm ceil.asm cos.asm cosh.asm exp.asm fabs.asm floor.asm fmod.asm frexp.asm isalnum.asm isalpha.asm iscntrl.asm isdigit.asm isgraph.asm islower.asm isprint.asm ispunct.asm isspace.asm isupper.asm isxdigit.asm ldexp.asm log.asm log10.asm modf.asm pow.asm sin.asm sinh.asm sqrt.asm strtod.asm tan.asm tanh.asm ufltinfo.asm ufltrnd.asm
+
+set RTL_SHARED_C_SRC=bsearch.c fpdata.c free.c gamma.c malloc.c maptab.c qsort.c realloc.c strtol.c strtoul.c udtoe.c udtof.c udtog.c uitoa.c ultoa.c ureverse.c ustoa.c uuitoa.c uultoa.c uustoa.c vsprintf.c
+set RTL_SHARED_ASM_SRC=abs.asm atoi.asm atol.asm atos.asm calloc.asm div.asm finite.asm fpadd.asm fpcmp.asm fpdiv.asm fpftol.asm fpltof.asm fpmul.asm fpneg.asm fppack.asm fpsub.asm fpultof.asm fpupop1.asm fpupop2.asm isascii.asm isinf.asm isnan.asm longjmp.asm memchr.asm memcmp.asm memcpy.asm memmove.asm memset.asm rand.asm sbrk.asm setjmp.asm sprintf.asm sqrtf.asm srand.asm stoi.asm strcasecmp.asm strcat.asm strchr.asm strcmp.asm strcpy.asm strcspn.asm strdup.asm strlen.asm strncasecmp.asm strncat.asm strncmp.asm strncpy.asm strpbrk.asm strrchr.asm strspn.asm strstr.asm strtok.asm tolower.asm toupper.asm uldiv.asm
 
-set FP_C_SRC=asin.c atan.c atan2.c exp.c floor.c fmod.c fpdata.c frexp.c ldexp.c log.c log10.c modf.c pow.c sin.c sinh.c sqrt.c tan.c tanh.c gamma.c udtoe.c
-set FP_ST_C_SRC=udtof.c udtog.c
-set FP_ASM_SRC=acos.asm atof.asm ceil.asm cos.asm fabs.asm finite.asm fpadd.asm fpcmp.asm fpdiv.asm fpftol.asm fpltof.asm fpmul.asm fpneg.asm fppack.asm fpsub.asm fpultof.asm fpupop1.asm fpupop2.asm sqrtf.asm isnan.asm isinf.asm
+set HLP_C_SRC=
+set HLP_ASM_SRC=bdivs.asm bdivu.asm bldix.asm bldiy.asm bmuls.asm brems.asm bremu.asm bshl.asm bshrs.asm bshru.asm bstix.asm bstiy.asm case.asm case24.asm case24D.asm case16.asm case16D.asm case8.asm case8D.asm iand.asm idivs.asm idivu.asm ildix.asm ildiy.asm imulu.asm imuls.asm indcall.asm ineg.asm inot.asm ior.asm irems.asm iremu.asm ishl.asm ishrs.asm ishru.asm istix.asm istiy.asm itol.asm ixor.asm ladd.asm land.asm lcmpu.asm lcmps.asm ldivs.asm ldivu.asm lldix.asm lldiy.asm lmulu.asm lmuls.asm lneg.asm lnot.asm lor.asm lrems.asm lremu.asm lshl.asm lshrs.asm lshru.asm lstix.asm lstiy.asm lsub.asm lxor.asm sand.asm sdivs.asm sdivu.asm sldix.asm sldiy.asm smulu.asm sneg.asm snot.asm sor.asm srems.asm sremu.asm sshl.asm sshrs.asm sshru.asm sstix.asm sstiy.asm stoi.asm stoiu.asm sxor.asm frbmuls.asm frbtof.asm frftob.asm frftoi.asm frftos.asm frftoub.asm frftoui.asm frftous.asm frimuls.asm frimulu.asm fritof.asm frsmuls.asm frsmulu.asm frstof.asm frubtof.asm fruitof.asm frustof.asm frameset0.asm frameset.asm setflag.asm scmpzero.asm icmpzero.asm lcmpzero.asm seqcase.asm seqcaseD.asm
 
 set DEBUG_C_SRC=
 set DEBUG_ASM_SRC=debugger.asm removeallbreakpoints.asm removeallwatchpoints.asm removebreakpoint.asm removewatchpoint.asm setbreakpoint.asm setreadwatchpoint.asm setwritewatchpoint.asm setreadwritewatchpoint.asm  setwatchpoint.asm
@@ -38,7 +44,7 @@ set TICE_ASM_SRC=tice.asm memset_fast.asm prgmcleanup.asm abort.asm os.asm
 set CPU=EZ80F91
 set STDINC=%INC%\lib\std
 set CEINC=%CEDEV%\include\lib\ce
-set ZLGINC=%SRC%\std_include
+set ZLGINC=%SRC%\include
 set CFLG_REL=-NOdebug -optsize -NOkeeplst -promote -quiet -fplib
 set AFLG=-genobj -NOigcase -include:%STDINC% -include:%ZLGINC% -NOlist -NOlistmac -pagelen:56 -pagewidth:100 -quiet -sdiopt -warn -NOzmasm
 
@@ -49,60 +55,47 @@ mkdir %LIBPATH%\std\ce
 
 REM --- CE Libraries
 
-echo --Building CE Debugger library...
+set C_FLG=%CFLG_REL% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%" -define:_%CPU%
+set ASM_FLG=%AFLG% -cpu:%CPU% -NOdebug
+
+echo -- Building CE Debugger library...
+set MY_PATH=%CE_PATH%
 set C_SRC=%DEBUG_C_SRC%
 set ASM_SRC=%DEBUG_ASM_SRC%
-set C_FLG=%CFLG_DBG% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%" -define:_%CPU%
-set ASM_FLG=%AFLG% -cpu:%CPU% -debug -include:%CEINC%
-call buildcelib.bat cdebug.lib
+call buildlib.bat cdebug.lib
 
-echo --Building TICE library...
+echo -- Building TICE library...
+set MY_PATH=%CE_PATH%
 set C_SRC=%TICE_C_SRC%
 set ASM_SRC=%TICE_ASM_SRC%
-set C_FLG=%CFLG_DBG% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%" -define:_%CPU%
-set ASM_FLG=%AFLG% -cpu:%CPU% -debug -include:%CEINC%
-call buildcelib.bat ctice.lib
-
-echo --Building RTL libraries...
-set C_SRC=%RTL_C_SRC%
-set ASM_SRC=%RTL_ASM_SRC%
-set C_FLG=%CFLG_REL% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%" -define:_%CPU%
-set ASM_FLG=%AFLG% -cpu:%CPU% -NOdebug
-call buildstdlib.bat crt.lib
+call buildlib.bat ctice.lib
 
-set C_SRC=%RTL_ST_C_SRC%
-set ASM_SRC=
-set C_FLG=%CFLG_REL% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%" -define:_%CPU%
-set ASM_FLG=%AFLG% -cpu:%CPU% -NOdebug
-call buildstdlib.bat crtS.lib
-
-set C_SRC=%RTL_NOKERNEL_C_SRC%
-set ASM_SRC=
-set C_FLG=%CFLG_REL% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%" -define:_%CPU%
-set ASM_FLG=%AFLG% -cpu:%CPU% -NOdebug
-call buildstdlib.bat nokernel.lib
-
-echo --Building CHLP libraries...
+echo -- Building CHLP libraries...
+set MY_PATH=%SHARED_PATH%
 set C_SRC=%HLP_C_SRC%
 set ASM_SRC=%HLP_ASM_SRC%
-set C_FLG=%CFLG_REL% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%"
-set ASM_FLG=%AFLG% -cpu:%CPU% -NOdebug
-call buildstdlib.bat chelp.lib
+call buildlib.bat chelp.lib
 
-echo --Building FPLIB libraries...
-set C_SRC=%FP_C_SRC%
-set ASM_SRC=%FP_ASM_SRC%
-set C_FLG=%CFLG_REL% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%"
-set ASM_FLG=%AFLG% -cpu:%CPU% -NOdebug
-call buildstdlib.bat fplib.lib
+echo -- Building RTL...
+set MY_PATH=%SHARED_PATH%
+set C_SRC=%RTL_SHARED_C_SRC%
+set ASM_SRC=%RTL_SHARED_ASM_SRC%
+call buildlib.bat crt.lib
 
-set C_SRC=%FP_ST_C_SRC%
-set ASM_SRC=
-set C_FLG=%CFLG_REL% -cpu:%CPU% -asmsw:"-cpu:%CPU% -include:%STDINC% -include:%ZLGINC%"
-set ASM_FLG=%AFLG% -cpu:%CPU% -NOdebug
-call buildstdlib.bat fplibS.lib
+echo -- Building RT Linked Library Portion...
+set MY_PATH=%LINKED_PATH%
+set C_SRC=%RTL_LINKED_C_SRC%
+set ASM_SRC=%RTL_LINKED_ASM_SRC%
+call buildlib.bat crt_linked.lib
+
+echo -- Building RT Static Library Portion...
+set MY_PATH=%STATIC_PATH%
+set C_SRC=%RTL_STATIC_C_SRC%
+set ASM_SRC=%RTL_STATIC_ASM_SRC%
+call buildlib.bat crt_static.lib
+
+echo -- Copying the libraries...
 
-echo --Copying the libraries...
 REM -- copy the libraries --
 copy /Y *.lib %LIBPATH%\std
 move /Y %LIBPATH%\std\ctice.lib %LIBPATH%\std\ce\ctice.lib

CEdev/lib/src/buildcelib.bat renamed to CEdev/lib/src/buildlib.bat

@@ -6,8 +6,8 @@ if exist %1 del %1
 
 set ALL_SRC=%C_SRC% %ASM_SRC%
 
-for %%i in (%C_SRC%) do %CC% %C_FLG% -stdinc:"%STDINC%;%ZLGINC%" "%cd%\ce\%%i"
+for %%i in (%C_SRC%) do %CC% %C_FLG% -stdinc:"%STDINC%;%ZLGINC%" "%cd%\%MY_PATH%\%%i"
 
-for %%i in (%ASM_SRC%) do %ASM% %ASM_FLG% ce\%%i 
+for %%i in (%ASM_SRC%) do %ASM% %ASM_FLG% %MY_PATH%\%%i 
 
 for %%i in (%ALL_SRC%) do %LIB% -quiet -warn %1=+%%~ni.obj