From 6db7b4e474eae4e4113ce4f6e8bdad4ad44e94fd Mon Sep 17 00:00:00 2001 From: MaartenBrock Date: Sun, 7 Jan 2007 09:57:10 +0000 Subject: [PATCH] * as/as_gbz80.dsp, as/z80/as_gbz80.dsp, * as/as_z80.dsp, as/z80/as_z80.dsp, * as/asx8051.dsp, as/mcs51/asx8051.dsp, * sdcc.dsw: moved project files into subdir * as/hc08/as_hc08.dsp, * as/hc08/Makefile.bcc, * as/hc08/Makefile.in, * as/mcs51/Makefile.bcc, * as/mcs51/Makefile.in, * as/z80/Makefile.bcc, * as/z80/Makefile.in, * as/link/mcs51/Makefile.bcc: use as/strcmpi.c * as/hc08/asm.h, * as/mcs51/asm.h, * as/z80/asm.h: added as_strcmpi() and as_strncmpi() prototypes * as/hc08/asmain.c, * as/hc08/assym.c, * as/mcs51/asmain.c, * as/mcs51/assym.c, * as/z80/assym.c: removed include "strcmpi.h" * as/hc08/strcmpi.c, * as/hc08/strcmpi.h, * as/mcs51/strcmpi.c, * as/mcs51/strcmpi.h, * support/Util/strcmpi.c, * support/Util/strcmpi.h: removed files * as/strcmpi.c: added as_strncmpi() git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4558 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 30 +++++++++++++++++++++ as/hc08/Makefile.bcc | 3 ++- as/hc08/Makefile.in | 3 ++- as/hc08/as_hc08.dsp | 6 +---- as/hc08/asm.h | 8 ++++-- as/hc08/asmain.c | 1 - as/hc08/assym.c | 1 - as/hc08/strcmpi.c | 35 ------------------------ as/hc08/strcmpi.h | 3 --- as/link/mcs51/Makefile.bcc | 13 ++++----- as/mcs51/Makefile.bcc | 3 ++- as/mcs51/Makefile.in | 3 ++- as/mcs51/asm.h | 6 ++++- as/mcs51/asmain.c | 3 +-- as/mcs51/assym.c | 1 - as/{ => mcs51}/asx8051.dsp | 38 ++++++++++++--------------- as/mcs51/strcmpi.c | 35 ------------------------ as/mcs51/strcmpi.h | 3 --- as/strcmpi.c | 21 +++++++++++++++ as/z80/Makefile.bcc | 7 ++--- as/z80/Makefile.in | 2 +- as/{ => z80}/as_gbz80.dsp | 50 +++++++++++++++++------------------ as/{ => z80}/as_z80.dsp | 54 ++++++++++++++++++-------------------- as/z80/asm.h | 5 +++- as/z80/assym.c | 1 - sdcc.dsw | 8 +++--- support/Util/strcmpi.c | 35 ------------------------ support/Util/strcmpi.h | 3 --- 28 files changed, 159 insertions(+), 222 deletions(-) delete mode 100644 as/hc08/strcmpi.c delete mode 100644 as/hc08/strcmpi.h rename as/{ => mcs51}/asx8051.dsp (86%) delete mode 100644 as/mcs51/strcmpi.c delete mode 100644 as/mcs51/strcmpi.h rename as/{ => z80}/as_gbz80.dsp (81%) rename as/{ => z80}/as_z80.dsp (80%) delete mode 100644 support/Util/strcmpi.c delete mode 100644 support/Util/strcmpi.h diff --git a/ChangeLog b/ChangeLog index a9f014bb..26b9cfc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +2007-01-06 Maarten Brock + + * as/as_gbz80.dsp, as/z80/as_gbz80.dsp, + * as/as_z80.dsp, as/z80/as_z80.dsp, + * as/asx8051.dsp, as/mcs51/asx8051.dsp, + * sdcc.dsw: moved project files into subdir + * as/hc08/as_hc08.dsp, + * as/hc08/Makefile.bcc, + * as/hc08/Makefile.in, + * as/mcs51/Makefile.bcc, + * as/mcs51/Makefile.in, + * as/z80/Makefile.bcc, + * as/z80/Makefile.in, + * as/link/mcs51/Makefile.bcc: use as/strcmpi.c + * as/hc08/asm.h, + * as/mcs51/asm.h, + * as/z80/asm.h: added as_strcmpi() and as_strncmpi() prototypes + * as/hc08/asmain.c, + * as/hc08/assym.c, + * as/mcs51/asmain.c, + * as/mcs51/assym.c, + * as/z80/assym.c: removed include "strcmpi.h" + * as/hc08/strcmpi.c, + * as/hc08/strcmpi.h, + * as/mcs51/strcmpi.c, + * as/mcs51/strcmpi.h, + * support/Util/strcmpi.c, + * support/Util/strcmpi.h: removed files + * as/strcmpi.c: added as_strncmpi() + 2007-01-05 Jesus Calvino-Fraga * sdcc.dsw: Added some dependencies on project config.dsp diff --git a/as/hc08/Makefile.bcc b/as/hc08/Makefile.bcc index a621c679..9a165ea4 100644 --- a/as/hc08/Makefile.bcc +++ b/as/hc08/Makefile.bcc @@ -6,7 +6,8 @@ PRJDIR = ../.. ASOBJECTS = asmain.obj aslex.obj assym.obj assubr.obj asnoice.obj \ asexpr.obj asdata.obj aslist.obj asout.obj asstore.obj \ - h08ext.obj h08pst.obj h08mch.obj h08adr.obj strcmpi.obj + h08ext.obj h08pst.obj h08mch.obj h08adr.obj \ + ../strcmpi.obj ASX8051 = $(PRJDIR)/bin/asx8051.exe diff --git a/as/hc08/Makefile.in b/as/hc08/Makefile.in index bb615d2c..87bb6c5c 100644 --- a/as/hc08/Makefile.in +++ b/as/hc08/Makefile.in @@ -40,7 +40,8 @@ LDFLAGS = @LDFLAGS@ ASOBJECTS = asmain.o aslex.o assym.o assubr.o asnoice.o \ asexpr.o asdata.o aslist.o asout.o asstore.o \ - m08ext.o m08pst.o m08mch.o m08adr.o strcmpi.o + m08ext.o m08pst.o m08mch.o m08adr.o \ + ../strcmpi.o ASSOURCES = $(patsubst %.o,%.c,$(ASOBJECTS)) ASHC08 = $(top_builddir)/bin/as-hc08$(EXEEXT) diff --git a/as/hc08/as_hc08.dsp b/as/hc08/as_hc08.dsp index 67749bb1..55b49289 100644 --- a/as/hc08/as_hc08.dsp +++ b/as/hc08/as_hc08.dsp @@ -143,7 +143,7 @@ SOURCE=.\m08pst.c # End Source File # Begin Source File -SOURCE=.\strcmpi.c +SOURCE=..\strcmpi.c # End Source File # End Group # Begin Group "Header Files" @@ -157,10 +157,6 @@ SOURCE=.\asm.h SOURCE=.\m6808.h # End Source File -# Begin Source File - -SOURCE=.\strcmpi.h -# End Source File # End Group # End Target # End Project diff --git a/as/hc08/asm.h b/as/hc08/asm.h index 5b6e8e13..81881bdf 100644 --- a/as/hc08/asm.h +++ b/as/hc08/asm.h @@ -677,10 +677,14 @@ extern void DefineCDB_Line(); extern char * cpu; extern char * dsft; -extern int hilo; +extern int hilo; extern struct mne mne[]; /* Machine dependent functions */ extern VOID minit(); -extern VOID machine(struct mne *); +extern VOID machine(struct mne *); + +/* strcmpi.c */ +extern int as_strcmpi(const char *s1, const char *s2); +extern int as_strncmpi(const char *s1, const char *s2, size_t n); diff --git a/as/hc08/asmain.c b/as/hc08/asmain.c index 0332a438..53691ee6 100644 --- a/as/hc08/asmain.c +++ b/as/hc08/asmain.c @@ -17,7 +17,6 @@ #include #include "asm.h" -#include "strcmpi.h" /*)Module asmain.c * diff --git a/as/hc08/assym.c b/as/hc08/assym.c index 6f504dea..21d718d5 100644 --- a/as/hc08/assym.c +++ b/as/hc08/assym.c @@ -27,7 +27,6 @@ #include #endif #include "asm.h" -#include "strcmpi.h" /*)Module assym.c * diff --git a/as/hc08/strcmpi.c b/as/hc08/strcmpi.c deleted file mode 100644 index 434529ce..00000000 --- a/as/hc08/strcmpi.c +++ /dev/null @@ -1,35 +0,0 @@ -/* strcmpi.c */ - -/* - * Compare two strings ignoring case. - * - * Taken from GLIBC 2.2.5. Original code is copyrighted "Free - * Software Foundation" and published under the GNU Lesser General - * Public License. - * - */ - -#include -#include "strcmpi.h" - -int as_strcmpi (const char *s1, const char *s2) -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0') - break; - } - while (c1 == c2); - - return c1 - c2; -} - diff --git a/as/hc08/strcmpi.h b/as/hc08/strcmpi.h deleted file mode 100644 index 63c35c43..00000000 --- a/as/hc08/strcmpi.h +++ /dev/null @@ -1,3 +0,0 @@ -/* strcmpi.h */ - -int as_strcmpi (const char *s1, const char *s2); diff --git a/as/link/mcs51/Makefile.bcc b/as/link/mcs51/Makefile.bcc index a087b1d2..51c73f5d 100644 --- a/as/link/mcs51/Makefile.bcc +++ b/as/link/mcs51/Makefile.bcc @@ -4,12 +4,13 @@ PRJDIR = ../.. !include $(PRJDIR)/Bcc.inc -LKOBJECTS = lkmain.obj lkhead.obj lkarea.obj lkdata.obj \ - lkeval.obj lklex.obj lksym.obj lkrloc.obj \ - lklibr.obj lklist.obj lkihx.obj lks19.obj \ - lknoice.obj lkmem.obj lkaomf51.obj \ - ../lkstore.obj \ - strcmpi.obj +LKOBJECTS = lkmain.obj lkarea.obj lkdata.obj \ + lkrloc.obj \ + lklibr.obj lkihx.obj lks19.obj \ + lkmem.obj lkaomf51.obj \ + ../lkeval.obj ../lkhead.obj ../lklex.obj ../lklist.obj \ + ../lknoice.obj ../lkstore.obj ../lksym.obj \ + ../../strcmpi.obj ASLINK = $(PRJDIR)/bin/aslink.exe diff --git a/as/mcs51/Makefile.bcc b/as/mcs51/Makefile.bcc index 97fc05a6..75876078 100644 --- a/as/mcs51/Makefile.bcc +++ b/as/mcs51/Makefile.bcc @@ -6,7 +6,8 @@ PRJDIR = ../.. ASOBJECTS = asmain.obj aslex.obj assym.obj assubr.obj asnoice.obj \ asexpr.obj asdata.obj aslist.obj asout.obj asstore.obj \ - i51ext.obj i51pst.obj i51mch.obj i51adr.obj strcmpi.obj + i51ext.obj i51pst.obj i51mch.obj i51adr.obj \ + ../strcmpi.obj ASX8051 = $(PRJDIR)/bin/asx8051.exe diff --git a/as/mcs51/Makefile.in b/as/mcs51/Makefile.in index 5b1aacbb..1e3d0952 100644 --- a/as/mcs51/Makefile.in +++ b/as/mcs51/Makefile.in @@ -40,7 +40,8 @@ LDFLAGS = @LDFLAGS@ ASOBJECTS = asmain.o aslex.o assym.o assubr.o asnoice.o \ asexpr.o asdata.o aslist.o asout.o asstore.o \ - i51ext.o i51pst.o i51mch.o i51adr.o strcmpi.o + i51ext.o i51pst.o i51mch.o i51adr.o \ + ../strcmpi.o ASSOURCES = $(patsubst %.o,%.c,$(ASOBJECTS)) ASX8051 = $(top_builddir)/bin/asx8051$(EXEEXT) diff --git a/as/mcs51/asm.h b/as/mcs51/asm.h index 7b9c1f6f..08f9bcb1 100644 --- a/as/mcs51/asm.h +++ b/as/mcs51/asm.h @@ -697,4 +697,8 @@ extern struct mne mne[]; /* Machine dependent functions */ extern VOID minit(); -extern VOID machine(struct mne *); +extern VOID machine(struct mne *); + +/* strcmpi.c */ +extern int as_strcmpi(const char *s1, const char *s2); +extern int as_strncmpi(const char *s1, const char *s2, size_t n); diff --git a/as/mcs51/asmain.c b/as/mcs51/asmain.c index a333ccea..1a506fbf 100644 --- a/as/mcs51/asmain.c +++ b/as/mcs51/asmain.c @@ -17,7 +17,6 @@ #include #include "asm.h" -#include "strcmpi.h" /*)Module asmain.c * @@ -944,7 +943,7 @@ loop: } } *p = 0; - if (++incfil == MAXINC || + if ((++incfil == MAXINC) || (ifp[incfil] = fopen(fn, "r")) == NULL) { --incfil; err('i'); diff --git a/as/mcs51/assym.c b/as/mcs51/assym.c index 6f504dea..21d718d5 100644 --- a/as/mcs51/assym.c +++ b/as/mcs51/assym.c @@ -27,7 +27,6 @@ #include #endif #include "asm.h" -#include "strcmpi.h" /*)Module assym.c * diff --git a/as/asx8051.dsp b/as/mcs51/asx8051.dsp similarity index 86% rename from as/asx8051.dsp rename to as/mcs51/asx8051.dsp index f59aa2f4..cd30aab0 100644 --- a/as/asx8051.dsp +++ b/as/mcs51/asx8051.dsp @@ -88,63 +88,63 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=mcs51\asdata.c +SOURCE=.\asdata.c # End Source File # Begin Source File -SOURCE=mcs51\asexpr.c +SOURCE=.\asexpr.c # End Source File # Begin Source File -SOURCE=mcs51\aslex.c +SOURCE=.\aslex.c # End Source File # Begin Source File -SOURCE=mcs51\aslist.c +SOURCE=.\aslist.c # End Source File # Begin Source File -SOURCE=mcs51\asmain.c +SOURCE=.\asmain.c # End Source File # Begin Source File -SOURCE=mcs51\asnoice.c +SOURCE=.\asnoice.c # End Source File # Begin Source File -SOURCE=mcs51\asout.c +SOURCE=.\asout.c # End Source File # Begin Source File -SOURCE=mcs51\asstore.c +SOURCE=.\asstore.c # End Source File # Begin Source File -SOURCE=mcs51\assubr.c +SOURCE=.\assubr.c # End Source File # Begin Source File -SOURCE=mcs51\assym.c +SOURCE=.\assym.c # End Source File # Begin Source File -SOURCE=mcs51\i51adr.c +SOURCE=.\i51adr.c # End Source File # Begin Source File -SOURCE=mcs51\i51ext.c +SOURCE=.\i51ext.c # End Source File # Begin Source File -SOURCE=mcs51\i51mch.c +SOURCE=.\i51mch.c # End Source File # Begin Source File -SOURCE=mcs51\i51pst.c +SOURCE=.\i51pst.c # End Source File # Begin Source File -SOURCE=.\mcs51\strcmpi.c +SOURCE=..\strcmpi.c # End Source File # End Group # Begin Group "Header Files" @@ -152,15 +152,11 @@ SOURCE=.\mcs51\strcmpi.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\mcs51\asm.h +SOURCE=.\asm.h # End Source File # Begin Source File -SOURCE=.\mcs51\i8051.h -# End Source File -# Begin Source File - -SOURCE=.\mcs51\strcmpi.h +SOURCE=.\i8051.h # End Source File # End Group # End Target diff --git a/as/mcs51/strcmpi.c b/as/mcs51/strcmpi.c deleted file mode 100644 index 434529ce..00000000 --- a/as/mcs51/strcmpi.c +++ /dev/null @@ -1,35 +0,0 @@ -/* strcmpi.c */ - -/* - * Compare two strings ignoring case. - * - * Taken from GLIBC 2.2.5. Original code is copyrighted "Free - * Software Foundation" and published under the GNU Lesser General - * Public License. - * - */ - -#include -#include "strcmpi.h" - -int as_strcmpi (const char *s1, const char *s2) -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0') - break; - } - while (c1 == c2); - - return c1 - c2; -} - diff --git a/as/mcs51/strcmpi.h b/as/mcs51/strcmpi.h deleted file mode 100644 index 63c35c43..00000000 --- a/as/mcs51/strcmpi.h +++ /dev/null @@ -1,3 +0,0 @@ -/* strcmpi.h */ - -int as_strcmpi (const char *s1, const char *s2); diff --git a/as/strcmpi.c b/as/strcmpi.c index 8c5ad454..c45ce9dc 100644 --- a/as/strcmpi.c +++ b/as/strcmpi.c @@ -10,6 +10,7 @@ */ #include +#include int as_strcmpi (const char *s1, const char *s2) { @@ -32,3 +33,23 @@ int as_strcmpi (const char *s1, const char *s2) return c1 - c2; } +int as_strncmpi (const char *s1, const char *s2, size_t n) +{ + const unsigned char *p1 = (const unsigned char *) s1; + const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + + if ((p1 == p2) || (n == 0)) + return 0; + + do + { + c1 = tolower (*p1++); + c2 = tolower (*p2++); + if (c1 == '\0') + break; + } + while ((c1 == c2) && --n); + + return c1 - c2; +} diff --git a/as/z80/Makefile.bcc b/as/z80/Makefile.bcc index 784c7817..e1ca4a0f 100644 --- a/as/z80/Makefile.bcc +++ b/as/z80/Makefile.bcc @@ -1,4 +1,4 @@ -# Makefile for Borlad C +# Makefile for Borland C PRJDIR = ../.. @@ -7,8 +7,9 @@ PRJDIR = ../.. CFLAGS = $(CFLAGS) -DINDEXLIB -DMLH_MAP -DSDK OBJECTS = asdata.obj asexpr.obj aslex.obj aslist.obj asmain.obj \ - asout.obj assubr.obj assym.obj z80adr.obj z80ext.obj \ - z80mch.obj z80pst.obj + asout.obj assubr.obj assym.obj z80adr.obj z80ext.obj \ + z80mch.obj z80pst.obj \ + ../strcmpi.obj TARGET = $(PRJDIR)/bin/as-z80.exe diff --git a/as/z80/Makefile.in b/as/z80/Makefile.in index 726274c3..c2ff4f19 100644 --- a/as/z80/Makefile.in +++ b/as/z80/Makefile.in @@ -9,7 +9,7 @@ OBJDIR = obj/$(EXT) SDC = . -SLIBSRC = NewAlloc.c strcmpi.c +SLIBSRC = NewAlloc.c ../strcmpi.c SRC = asdata.c asexpr.c aslex.c aslist.c asmain.c asout.c \ assubr.c assym.c z80adr.c z80ext.c z80mch.c z80pst.c diff --git a/as/as_gbz80.dsp b/as/z80/as_gbz80.dsp similarity index 81% rename from as/as_gbz80.dsp rename to as/z80/as_gbz80.dsp index e8e26dbd..48c59d4d 100644 --- a/as/as_gbz80.dsp +++ b/as/z80/as_gbz80.dsp @@ -32,13 +32,13 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "z80\Debug_gbz80" -# PROP BASE Intermediate_Dir "z80\Debug_gbz80" +# PROP BASE Output_Dir "Debug_gbz80" +# PROP BASE Intermediate_Dir "Debug_gbz80" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "z80\Debug_gbz80" -# PROP Intermediate_Dir "z80\Debug_gbz80" +# PROP Output_Dir "Debug_gbz80" +# PROP Intermediate_Dir "Debug_gbz80" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c @@ -56,14 +56,14 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "z80\Release_gbz80" -# PROP BASE Intermediate_Dir "z80\Release_gbz80" +# PROP BASE Output_Dir "Release_gbz80" +# PROP BASE Intermediate_Dir "Release_gbz80" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "z80\Release_gbz80" -# PROP Intermediate_Dir "z80\Release_gbz80" +# PROP Output_Dir "Release_gbz80" +# PROP Intermediate_Dir "Release_gbz80" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c @@ -88,66 +88,66 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\z80\asdata.c +SOURCE=.\asdata.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\asexpr.c +SOURCE=.\asexpr.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\aslex.c +SOURCE=.\aslex.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\aslist.c +SOURCE=.\aslist.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\asmain.c +SOURCE=.\asmain.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\asout.c +SOURCE=.\asout.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\assubr.c +SOURCE=.\assubr.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\assym.c +SOURCE=.\assym.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=..\support\Util\strcmpi.c +SOURCE=..\strcmpi.c # End Source File # Begin Source File -SOURCE=.\z80\z80adr.c +SOURCE=.\z80adr.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\z80ext.c +SOURCE=.\z80ext.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\z80mch.c +SOURCE=.\z80mch.c # ADD CPP /D "GAMEBOY" # End Source File # Begin Source File -SOURCE=.\z80\z80pst.c +SOURCE=.\z80pst.c # ADD CPP /D "GAMEBOY" # End Source File # End Group @@ -156,19 +156,19 @@ SOURCE=.\z80\z80pst.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\z80\alloc.h +SOURCE=.\alloc.h # End Source File # Begin Source File -SOURCE=.\z80\asm.h +SOURCE=.\asm.h # End Source File # Begin Source File -SOURCE=.\z80\string.h +SOURCE=.\string.h # End Source File # Begin Source File -SOURCE=.\z80\z80.h +SOURCE=.\z80.h # End Source File # End Group # End Target diff --git a/as/as_z80.dsp b/as/z80/as_z80.dsp similarity index 80% rename from as/as_z80.dsp rename to as/z80/as_z80.dsp index 012b8a9b..cb9d6fd8 100644 --- a/as/as_z80.dsp +++ b/as/z80/as_z80.dsp @@ -32,13 +32,13 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "z80\Debug" -# PROP BASE Intermediate_Dir "z80\Debug" +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "z80\Debug" -# PROP Intermediate_Dir "z80\Debug" +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c @@ -56,14 +56,14 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "z80\Release" -# PROP BASE Intermediate_Dir "z80\Release" +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "z80\Release" -# PROP Intermediate_Dir "z80\Release" +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c @@ -88,55 +88,55 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\z80\asdata.c +SOURCE=.\asdata.c # End Source File # Begin Source File -SOURCE=.\z80\asexpr.c +SOURCE=.\asexpr.c # End Source File # Begin Source File -SOURCE=.\z80\aslex.c +SOURCE=.\aslex.c # End Source File # Begin Source File -SOURCE=.\z80\aslist.c +SOURCE=.\aslist.c # End Source File # Begin Source File -SOURCE=.\z80\asmain.c +SOURCE=.\asmain.c # End Source File # Begin Source File -SOURCE=.\z80\asout.c +SOURCE=.\asout.c # End Source File # Begin Source File -SOURCE=.\z80\assubr.c +SOURCE=.\assubr.c # End Source File # Begin Source File -SOURCE=.\z80\assym.c +SOURCE=.\assym.c # End Source File # Begin Source File -SOURCE=..\support\Util\strcmpi.c +SOURCE=..\strcmpi.c # End Source File # Begin Source File -SOURCE=.\z80\z80adr.c +SOURCE=.\z80adr.c # End Source File # Begin Source File -SOURCE=.\z80\z80ext.c +SOURCE=.\z80ext.c # End Source File # Begin Source File -SOURCE=.\z80\z80mch.c +SOURCE=.\z80mch.c # End Source File # Begin Source File -SOURCE=.\z80\z80pst.c +SOURCE=.\z80pst.c # End Source File # End Group # Begin Group "Header Files" @@ -144,23 +144,19 @@ SOURCE=.\z80\z80pst.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\z80\alloc.h +SOURCE=.\alloc.h # End Source File # Begin Source File -SOURCE=.\z80\asm.h +SOURCE=.\asm.h # End Source File # Begin Source File -SOURCE=..\support\Util\strcmpi.h +SOURCE=.\string.h # End Source File # Begin Source File -SOURCE=.\z80\string.h -# End Source File -# Begin Source File - -SOURCE=.\z80\z80.h +SOURCE=.\z80.h # End Source File # End Group # End Target diff --git a/as/z80/asm.h b/as/z80/asm.h index 91de7ae1..812f20bc 100644 --- a/as/z80/asm.h +++ b/as/z80/asm.h @@ -592,10 +592,13 @@ extern VOID out_tw(); extern char * cpu; extern char * dsft; -extern int hilo; +extern int hilo; extern struct mne mne[]; /* Machine dependent functions */ extern VOID minit(); +/* strcmpi.c */ +extern int as_strcmpi(const char *s1, const char *s2); +extern int as_strncmpi(const char *s1, const char *s2, size_t n); diff --git a/as/z80/assym.c b/as/z80/assym.c index 77e0c268..771f5320 100644 --- a/as/z80/assym.c +++ b/as/z80/assym.c @@ -14,7 +14,6 @@ #include #include #include "asm.h" -#include "strcmpi.h" /*)Module assym.c * diff --git a/sdcc.dsw b/sdcc.dsw index 6bd6de36..0d7fd419 100644 --- a/sdcc.dsw +++ b/sdcc.dsw @@ -51,7 +51,7 @@ Package=<4> ############################################################################### -Project: "as_gbz80"=.\as\as_gbz80.dsp - Package Owner=<4> +Project: "as_gbz80"=.\as\z80\as_gbz80.dsp - Package Owner=<4> Package=<5> {{{ @@ -75,7 +75,7 @@ Package=<4> ############################################################################### -Project: "as_z80"=.\as\as_z80.dsp - Package Owner=<4> +Project: "as_z80"=.\as\z80\as_z80.dsp - Package Owner=<4> Package=<5> {{{ @@ -102,7 +102,7 @@ Package=<4> ############################################################################### -Project: "asx8051"=.\as\asx8051.dsp - Package Owner=<4> +Project: "asx8051"=.\as\mcs51\asx8051.dsp - Package Owner=<4> Package=<5> {{{ @@ -489,7 +489,7 @@ Package=<4> ############################################################################### -Project: "z80"=.\SRC\z80\z80.dsp - Package Owner=<4> +Project: "z80"=.\src\z80\z80.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/support/Util/strcmpi.c b/support/Util/strcmpi.c deleted file mode 100644 index c812ef0a..00000000 --- a/support/Util/strcmpi.c +++ /dev/null @@ -1,35 +0,0 @@ -/* strcmpi.c */ - -/* - * Compare two strings ignoring case. - * - * Taken from GLIBC 2.2.5. Original code is copyrighted "Free - * Software Foundation" and published under the GNU Lesser General - * Public License. - * - */ - -#include -#include "strcmpi.h" - -int as_strcmpi (const char *s1, const char *s2) -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0') - break; - } - while (c1 == c2); - - return c1 - c2; -} - diff --git a/support/Util/strcmpi.h b/support/Util/strcmpi.h deleted file mode 100644 index b284f48a..00000000 --- a/support/Util/strcmpi.h +++ /dev/null @@ -1,3 +0,0 @@ -/* strcmpi.h */ - -int as_strcmpi (const char *s1, const char *s2); -- 2.30.2