X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fmcs51%2Flknoice.c;h=2cd6a91cdcbbbb0164a1efadd4107c7cb3145948;hb=cd9b65fac3729510de6f9dc246f5453dad9cd92e;hp=04500dd92bb2b3eda97ea45a2426d55a56d0bdc5;hpb=f93eb1eafde8985b8634d476b01641de63124b9e;p=fw%2Fsdcc

diff --git a/as/mcs51/lknoice.c b/as/mcs51/lknoice.c
index 04500dd9..2cd6a91c 100644
--- a/as/mcs51/lknoice.c
+++ b/as/mcs51/lknoice.c
@@ -11,19 +11,17 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <string.h>
-#if !defined(_MSC_VER)
-#include <alloc.h>
-#endif
 #include "aslink.h"
+#include "strcmpi.h"
 
-static void DefineGlobal( char *name, addr_t value, int page );
-static void DefineScoped( char *name, addr_t value, int page );
-static void DefineFile( char *name, addr_t value, int page );
-static void DefineFunction( char *name, addr_t value, int page );
-static void DefineStaticFunction( char *name, addr_t value, int page );
-static void DefineEndFunction( addr_t value, int page );
-static void DefineLine( char *lineString, addr_t value, int page );
-static void PagedAddress( addr_t value, int page );
+static void DefineGlobal( char *name, Addr_T value, int page );
+static void DefineScoped( char *name, Addr_T value, int page );
+static void DefineFile( char *name, Addr_T value, int page );
+static void DefineFunction( char *name, Addr_T value, int page );
+static void DefineStaticFunction( char *name, Addr_T value, int page );
+static void DefineEndFunction( Addr_T value, int page );
+static void DefineLine( char *lineString, Addr_T value, int page );
+static void PagedAddress( Addr_T value, int page );
 
 /*
  * Called from lstarea in lklist.c for each symbol.
@@ -31,7 +29,7 @@ static void PagedAddress( addr_t value, int page );
  * Generates appropriate NoICE commands into output file, if any is open
  *
  */
-void DefineNoICE( char *name, addr_t value, int page )
+void DefineNoICE( char *name, Addr_T value, int page )
 {
 	char token1[NCPS];			/* parse for file.function.symbol */
 	char token2[NCPS];
@@ -121,7 +119,7 @@ static char currentFunction[NCPS];
  * static function:
  * Define "name" as a global symbol
  */
-void DefineGlobal( char *name, addr_t value, int page )
+void DefineGlobal( char *name, Addr_T value, int page )
 {
 	fprintf( jfp, "DEF %s ", name );
 	PagedAddress( value, page );
@@ -131,7 +129,7 @@ void DefineGlobal( char *name, addr_t value, int page )
  * static function:
  * Define "name" as a static (scoped) symbol
  */
-void DefineScoped( char *name, addr_t value, int page )
+void DefineScoped( char *name, Addr_T value, int page )
 {
 	fprintf( jfp, "DEFS %s ", name );
 	PagedAddress( value, page );
@@ -141,9 +139,9 @@ void DefineScoped( char *name, addr_t value, int page )
  * static function:
  * Define "name" as the current file
  */
-void DefineFile( char *name, addr_t value, int page )
+void DefineFile( char *name, Addr_T value, int page )
 {
-	if (strcmpi( name, currentFile ) != 0)
+	if (as_strcmpi( name, currentFile ) != 0)
 	{
 		strcpy( currentFile, name );
 		if (value != 0)
@@ -162,9 +160,9 @@ void DefineFile( char *name, addr_t value, int page )
  * static function:
  * Define "name" as the current function
  */
-void DefineFunction( char *name, addr_t value, int page )
+void DefineFunction( char *name, Addr_T value, int page )
 {
-	if (strcmpi( name, currentFunction ) != 0)
+	if (as_strcmpi( name, currentFunction ) != 0)
 	{
 		strcpy( currentFunction, name );
                 if (value != 0)
@@ -185,9 +183,9 @@ void DefineFunction( char *name, addr_t value, int page )
  * static function:
  * Define "name" as the current static (scoped) function
  */
-void DefineStaticFunction( char *name, addr_t value, int page )
+void DefineStaticFunction( char *name, Addr_T value, int page )
 {
-	if (strcmpi( name, currentFunction ) != 0)
+	if (as_strcmpi( name, currentFunction ) != 0)
 	{
 		strcpy( currentFunction, name );
 		if (value != 0)
@@ -208,7 +206,7 @@ void DefineStaticFunction( char *name, addr_t value, int page )
  * static function:
  * Define the end of the current function
  */
-void DefineEndFunction( addr_t value, int page )
+void DefineEndFunction( Addr_T value, int page )
 {
 	if (currentFunction[0] != 0)
 	{
@@ -230,7 +228,7 @@ void DefineEndFunction( addr_t value, int page )
  * static function:
  * Define "lineNumber" as a line in the current file
  */
-void DefineLine( char *lineString, addr_t value, int page )
+void DefineLine( char *lineString, Addr_T value, int page )
 {
 	int indigit, lineNumber = 0;
 
@@ -242,7 +240,7 @@ void DefineLine( char *lineString, addr_t value, int page )
         PagedAddress( value, page );
 }
 
-void PagedAddress( addr_t value, int page )
+void PagedAddress( Addr_T value, int page )
 {
 	fprintf( jfp, "%X:0x%X\n", page, value );
 }