X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fmcs51%2Flkaomf51.c;h=7e6503177c03f09a5ad32888e43d073f4be411ac;hb=90bdb43b342189fcb94a398855d43f3f47f96738;hp=fa009e7732d9ed71c379249e7889eccb2f7f706a;hpb=92918ab00299efad3446d5d902eb25b3b0468b63;p=fw%2Fsdcc

diff --git a/as/mcs51/lkaomf51.c b/as/mcs51/lkaomf51.c
index fa009e77..7e650317 100644
--- a/as/mcs51/lkaomf51.c
+++ b/as/mcs51/lkaomf51.c
@@ -74,7 +74,7 @@ typedef struct
 
 int numlinenum=0;
 _linenum * linenum=NULL;
-
+#if 0
 typedef struct
 {
 	char * name;
@@ -86,6 +86,12 @@ _UsageType UsageType[]=
 {
 	{"CSEG",		0},
 	{"GSINIT",		0},
+	{"GSINIT0",		0},
+	{"GSINIT1",		0},
+	{"GSINIT2",		0},
+	{"GSINIT3",		0},
+	{"GSINIT4",		0},
+	{"GSINIT5",		0},
 	{"GSFINAL",		0},
 	{"HOME",		0},
 	{"XINIT",		0},
@@ -102,7 +108,7 @@ _UsageType UsageType[]=
 	{"BSEG",		4},
 	{"",			5} /*A typeless number?*/
 };
-
+#endif
 char * UsageTypeName[]={"CODE", "XDATA", "DATA", "IDATA", "BIT", "NUMBER"};
 int AddNumber;
 unsigned char * ihxBuff=NULL;
@@ -702,6 +708,7 @@ void CollectInfoFromCDB(void)
 					symbol[numsym].UsageType=0x00;/*A procedure name symbol*/
 					symbol[numsym].Procedure=-1; /*Global symbol*/
 					symbol[numsym].Address=-1;/*Collected later*/
+					symbol[numsym].Static=-1; // o_gloom
 					numsym++;
 				}
 			break;
@@ -869,12 +876,12 @@ void CollectInfoFromCDB(void)
 	fclose(CDBin);
 }
 
-int hex2dec (char hex_digit)
+int hex2dec (unsigned char hex_digit)
 {
-   int j;
-   j=toupper(hex_digit)-'0';
-   if (j>9) j -= 7;
-   return j;
+   if (isdigit (hex_digit))
+      return hex_digit-'0';
+   else
+      return toupper (hex_digit)-'A'+10;
 }
 
 unsigned char GetByte(char * buffer)