* 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

diff --git a/ChangeLog b/ChangeLog
index a9f014bb41cc97a70e70356dec9af48096c1fd52..26b9cfc260c147de84836e1dc7dbc8fde12f5971 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2007-01-06 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * 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 <jesusc at ece.ubc.ca>
 
        * sdcc.dsw: Added some dependencies on project config.dsp

diff --git a/as/as_gbz80.dsp b/as/as_gbz80.dsp
deleted file mode 100644 (file)
index e8e26db..0000000
--- a/as/as_gbz80.dsp
+++ /dev/null
@@ -1,175 +0,0 @@
-# Microsoft Developer Studio Project File - Name="as_gbz80" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=as_gbz80 - Win32 Release\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "as_gbz80.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "as_gbz80.mak" CFG="as_gbz80 - Win32 Release"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "as_gbz80 - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "as_gbz80 - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "as_gbz80 - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "z80\Debug_gbz80"\r
-# PROP BASE Intermediate_Dir "z80\Debug_gbz80"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "z80\Debug_gbz80"\r
-# PROP Intermediate_Dir "z80\Debug_gbz80"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# 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\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\support\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept\r
-\r
-!ELSEIF  "$(CFG)" == "as_gbz80 - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "z80\Release_gbz80"\r
-# PROP BASE Intermediate_Dir "z80\Release_gbz80"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "z80\Release_gbz80"\r
-# PROP Intermediate_Dir "z80\Release_gbz80"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# 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\r
-# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "as_gbz80 - Win32 Debug"\r
-# Name "as_gbz80 - Win32 Release"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asdata.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asexpr.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\aslex.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\aslist.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asmain.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asout.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\assubr.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\assym.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\support\Util\strcmpi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80adr.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80ext.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80mch.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80pst.c\r
-# ADD CPP /D "GAMEBOY"\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\alloc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\string.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/as/as_z80.dsp b/as/as_z80.dsp
deleted file mode 100644 (file)
index 012b8a9..0000000
--- a/as/as_z80.dsp
+++ /dev/null
@@ -1,167 +0,0 @@
-# Microsoft Developer Studio Project File - Name="as_z80" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=as_z80 - Win32 Release\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "as_z80.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "as_z80.mak" CFG="as_z80 - Win32 Release"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "as_z80 - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "as_z80 - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "as_z80 - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "z80\Debug"\r
-# PROP BASE Intermediate_Dir "z80\Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "z80\Debug"\r
-# PROP Intermediate_Dir "z80\Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# 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\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../support/util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
-\r
-!ELSEIF  "$(CFG)" == "as_z80 - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "z80\Release"\r
-# PROP BASE Intermediate_Dir "z80\Release"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "z80\Release"\r
-# PROP Intermediate_Dir "z80\Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# 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\r
-# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "as_z80 - Win32 Debug"\r
-# Name "as_z80 - Win32 Release"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asdata.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asexpr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\aslex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\aslist.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asmain.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asout.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\assubr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\assym.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\support\Util\strcmpi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80adr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80ext.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80mch.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80pst.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\alloc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\asm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\support\Util\strcmpi.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\string.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\z80\z80.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/as/asx8051.dsp b/as/asx8051.dsp
deleted file mode 100644 (file)
index f59aa2f..0000000
--- a/as/asx8051.dsp
+++ /dev/null
@@ -1,167 +0,0 @@
-# Microsoft Developer Studio Project File - Name="asx8051" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=asx8051 - Win32 Release\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "asx8051.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "asx8051.mak" CFG="asx8051 - Win32 Release"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "asx8051 - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "asx8051 - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "asx8051 - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# 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\r
-# ADD 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\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
-\r
-!ELSEIF  "$(CFG)" == "asx8051 - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# 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\r
-# ADD CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "asx8051 - Win32 Debug"\r
-# Name "asx8051 - Win32 Release"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\asdata.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\asexpr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\aslex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\aslist.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\asmain.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\asnoice.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\asout.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\asstore.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\assubr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\assym.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\i51adr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\i51ext.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\i51mch.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=mcs51\i51pst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\mcs51\strcmpi.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\mcs51\asm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\mcs51\i8051.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\mcs51\strcmpi.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/as/hc08/Makefile.bcc b/as/hc08/Makefile.bcc
index a621c67906f13f50663a491fd3ce0294d2b18bf7..9a165ea41c31e0e37b213c9650de8275072f08c8 100644 (file)
--- 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 bb615d2c06aa8844e3efcc6da3bb54dd9ba0c5a5..87bb6c5cc3a14db5d309b17d5ac3335ebc6a27ab 100644 (file)
--- 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 67749bb1a97bc520f508a41a090f8cd4cfa6efd6..55b49289a58f9533714bde321a82a2717317e1f3 100644 (file)
--- a/as/hc08/as_hc08.dsp
+++ b/as/hc08/as_hc08.dsp
@@ -143,7 +143,7 @@ SOURCE=.\m08pst.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\strcmpi.c\r
+SOURCE=..\strcmpi.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -157,10 +157,6 @@ SOURCE=.\asm.h
 \r
 SOURCE=.\m6808.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\strcmpi.h\r
-# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/as/hc08/asm.h b/as/hc08/asm.h
index 5b6e8e13a38c97affac8cafb831e8e55aa3bda93..81881bdf374cc3914b9a98bf0b87cc357dab7a5b 100644 (file)
--- 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 0332a438f80dd59a43fe5dfc49c617bcb521dfd9..53691ee6ecdb36fb9fa7c80d559839428e634828 100644 (file)
--- a/as/hc08/asmain.c
+++ b/as/hc08/asmain.c
@@ -17,7 +17,6 @@
 #include <string.h>
 
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module      asmain.c
  *

diff --git a/as/hc08/assym.c b/as/hc08/assym.c
index 6f504deab5af9224f8fb256d9535ddf33f52daf9..21d718d5ad91c786829f24b314bd257b3a47be98 100644 (file)
--- a/as/hc08/assym.c
+++ b/as/hc08/assym.c
@@ -27,7 +27,6 @@
 #include <alloc.h>
 #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 (file)
index 434529c..0000000
--- 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 <ctype.h>
-#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 (file)
index 63c35c4..0000000
--- 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 a087b1d22f06848231dbcc36ff4c9ba771220693..51c73f5df3b22be507bc54f9fd7876cc32546027 100644 (file)
--- 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 97fc05a640d07e7b8f01549f3335b2266e81296f..758760781b57f213cac2b9bb39323e5c6e81aa09 100644 (file)
--- 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 5b1aacbbdd3d321afa56050181c79a2cf9c4a7fb..1e3d0952b44c30c0cd9ea8f2a741412ef7433cee 100644 (file)
--- 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 7b9c1f6f39d8222072197d86eb72a5280a2afcca..08f9bcb18bafd1e7a10a319785dc0291b1260682 100644 (file)
--- 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 a333cceae75c6568295119f5308125a712a600c6..1a506fbf8ca84c0ba7e6df94e1478bab13c2b288 100644 (file)
--- a/as/mcs51/asmain.c
+++ b/as/mcs51/asmain.c
@@ -17,7 +17,6 @@
 #include <string.h>
 
 #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 6f504deab5af9224f8fb256d9535ddf33f52daf9..21d718d5ad91c786829f24b314bd257b3a47be98 100644 (file)
--- a/as/mcs51/assym.c
+++ b/as/mcs51/assym.c
@@ -27,7 +27,6 @@
 #include <alloc.h>
 #endif
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module      assym.c
  *

diff --git a/as/mcs51/asx8051.dsp b/as/mcs51/asx8051.dsp
new file mode 100644 (file)
index 0000000..cd30aab
--- /dev/null
+++ b/as/mcs51/asx8051.dsp
@@ -0,0 +1,163 @@
+# Microsoft Developer Studio Project File - Name="asx8051" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+\r
+CFG=asx8051 - Win32 Release\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "asx8051.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "asx8051.mak" CFG="asx8051 - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "asx8051 - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "asx8051 - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "asx8051 - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug"\r
+# PROP Intermediate_Dir "Debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# 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\r
+# ADD 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\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
+# ADD RSC /l 0x409 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
+\r
+!ELSEIF  "$(CFG)" == "asx8051 - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Release"\r
+# PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# 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\r
+# ADD CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "asx8051 - Win32 Debug"\r
+# Name "asx8051 - Win32 Release"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=.\asdata.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asexpr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\aslex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\aslist.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asmain.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asnoice.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asout.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asstore.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\assubr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\assym.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\i51adr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\i51ext.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\i51mch.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\i51pst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\strcmpi.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\asm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\i8051.h\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/as/mcs51/strcmpi.c b/as/mcs51/strcmpi.c
deleted file mode 100644 (file)
index 434529c..0000000
--- 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 <ctype.h>
-#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 (file)
index 63c35c4..0000000
--- 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 8c5ad454a779968f5f3c36f1244a6778e3331ad7..c45ce9dc555bca09df076bc581a36c566328da59 100644 (file)
--- a/as/strcmpi.c
+++ b/as/strcmpi.c
@@ -10,6 +10,7 @@
  */
 
 #include <ctype.h>
+#include <stddef.h>
 
 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 784c78174b6b94bfbf485a8c773b3a8e28ffb1ac..e1ca4a0f6f1aebb55c1e940de7c0b8412306495e 100644 (file)
--- 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 726274c306d591ef25e79d1c3c4c51f56444e404..c2ff4f1935bb6fd5c50eade6f9a444b0ee6e5a8d 100644 (file)
--- 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/z80/as_gbz80.dsp b/as/z80/as_gbz80.dsp
new file mode 100644 (file)
index 0000000..48c59d4
--- /dev/null
+++ b/as/z80/as_gbz80.dsp
@@ -0,0 +1,175 @@
+# Microsoft Developer Studio Project File - Name="as_gbz80" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+\r
+CFG=as_gbz80 - Win32 Release\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "as_gbz80.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "as_gbz80.mak" CFG="as_gbz80 - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "as_gbz80 - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "as_gbz80 - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "as_gbz80 - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug_gbz80"\r
+# PROP BASE Intermediate_Dir "Debug_gbz80"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug_gbz80"\r
+# PROP Intermediate_Dir "Debug_gbz80"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# 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\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\support\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
+# ADD RSC /l 0x409 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept\r
+\r
+!ELSEIF  "$(CFG)" == "as_gbz80 - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Release_gbz80"\r
+# PROP BASE Intermediate_Dir "Release_gbz80"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Release_gbz80"\r
+# PROP Intermediate_Dir "Release_gbz80"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# 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\r
+# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "as_gbz80 - Win32 Debug"\r
+# Name "as_gbz80 - Win32 Release"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=.\asdata.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asexpr.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\aslex.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\aslist.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asmain.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asout.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\assubr.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\assym.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\strcmpi.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80adr.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80ext.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80mch.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80pst.c\r
+# ADD CPP /D "GAMEBOY"\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\alloc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\string.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80.h\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/as/z80/as_z80.dsp b/as/z80/as_z80.dsp
new file mode 100644 (file)
index 0000000..cb9d6fd
--- /dev/null
+++ b/as/z80/as_z80.dsp
@@ -0,0 +1,163 @@
+# Microsoft Developer Studio Project File - Name="as_z80" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+\r
+CFG=as_z80 - Win32 Release\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "as_z80.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "as_z80.mak" CFG="as_z80 - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "as_z80 - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "as_z80 - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "as_z80 - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug"\r
+# PROP Intermediate_Dir "Debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# 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\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../support/util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
+# ADD RSC /l 0x409 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
+\r
+!ELSEIF  "$(CFG)" == "as_z80 - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Ignore_Export_Lib 0\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Release"\r
+# PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# 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\r
+# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "as_z80 - Win32 Debug"\r
+# Name "as_z80 - Win32 Release"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=.\asdata.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asexpr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\aslex.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\aslist.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asmain.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asout.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\assubr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\assym.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\strcmpi.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80adr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80ext.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80mch.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80pst.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\alloc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asm.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\string.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\z80.h\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/as/z80/asm.h b/as/z80/asm.h
index 91de7ae161974efc9a46900fc840e114b88e0d2d..812f20bc40e958e61c55500b67fe8d278b5478e3 100644 (file)
--- 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 77e0c2682d9feca0b91df3804b6284e23f971dff..771f5320bffbe4e8ff30ff697773f0b125d1ee19 100644 (file)
--- a/as/z80/assym.c
+++ b/as/z80/assym.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module      assym.c
  *

diff --git a/sdcc.dsw b/sdcc.dsw
index 6bd6de36a7eac0e46decc5391641bea80d8d2870..0d7fd419abb58720a186376f8514f52c0a9aceae 100644 (file)
--- a/sdcc.dsw
+++ b/sdcc.dsw
@@ -51,7 +51,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "as_gbz80"=.\as\as_gbz80.dsp - Package Owner=<4>\r
+Project: "as_gbz80"=.\as\z80\as_gbz80.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -75,7 +75,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "as_z80"=.\as\as_z80.dsp - Package Owner=<4>\r
+Project: "as_z80"=.\as\z80\as_z80.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -102,7 +102,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "asx8051"=.\as\asx8051.dsp - Package Owner=<4>\r
+Project: "asx8051"=.\as\mcs51\asx8051.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -489,7 +489,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "z80"=.\SRC\z80\z80.dsp - Package Owner=<4>\r
+Project: "z80"=.\src\z80\z80.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r

diff --git a/support/Util/strcmpi.c b/support/Util/strcmpi.c
deleted file mode 100644 (file)
index c812ef0..0000000
--- a/support/Util/strcmpi.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* strcmpi.c */\r
-\r
-/*\r
- * Compare two strings ignoring case.\r
- *\r
- * Taken from GLIBC 2.2.5. Original code is copyrighted "Free\r
- * Software Foundation" and published under the GNU Lesser General\r
- * Public License.\r
- * \r
- */\r
-\r
-#include <ctype.h>\r
-#include "strcmpi.h"\r
-\r
-int as_strcmpi (const char *s1, const char *s2)\r
-{\r
-  const unsigned char *p1 = (const unsigned char *) s1;\r
-  const unsigned char *p2 = (const unsigned char *) s2;\r
-  unsigned char c1, c2;\r
-\r
-  if (p1 == p2)\r
-    return 0;\r
-\r
-  do\r
-    {\r
-      c1 = tolower (*p1++);\r
-      c2 = tolower (*p2++);\r
-      if (c1 == '\0')\r
-       break;\r
-    }\r
-  while (c1 == c2);\r
-  \r
-  return c1 - c2;\r
-}\r
-\r

diff --git a/support/Util/strcmpi.h b/support/Util/strcmpi.h
deleted file mode 100644 (file)
index b284f48..0000000
--- a/support/Util/strcmpi.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* strcmpi.h */\r
-\r
-int as_strcmpi (const char *s1, const char *s2);\r