X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCC.lex;h=9ff54cb70022877e4910ad770eb2305f37d39815;hb=91b0931c40c5cad20cf18aa66303f9cb850f5dbc;hp=cc81d1ec66dbc392e99f7ae16cdafbfb83fb581e;hpb=c7213e51f3526a7559d03919d64907ccc0b25aa7;p=fw%2Fsdcc

diff --git a/src/SDCC.lex b/src/SDCC.lex
index cc81d1ec..9ff54cb7 100644
--- a/src/SDCC.lex
+++ b/src/SDCC.lex
@@ -84,14 +84,14 @@ struct options  save_options  ;
 %%
 "_asm"         {  
   count(); 
-  asmp = asmbuff = Safe_realloc (asmbuff, INITIAL_INLINEASM);
+  asmp = asmbuff = realloc (asmbuff, INITIAL_INLINEASM);
   asmbuffSize=INITIAL_INLINEASM;
   BEGIN(asm) ;
 }
 <asm>"_endasm" { 
   count();
   *asmp = '\0';
-  yylval.yyinline = Safe_calloc (1, strlen(asmbuff)+1);
+  yylval.yyinline = malloc (strlen(asmbuff)+1);
   strcpy(yylval.yyinline,asmbuff);
   BEGIN(INITIAL);
   return (INLINEASM);
@@ -101,7 +101,7 @@ struct options  save_options  ;
     // increase the buffersize with 50%
     int size=asmp-asmbuff;
     asmbuffSize=asmbuffSize*3/2;
-    asmbuff = Safe_realloc (asmbuff, asmbuffSize); 
+    asmbuff = realloc (asmbuff, asmbuffSize); 
     asmp=asmbuff+size;
   }
   *asmp++ = yytext[0];
@@ -112,7 +112,7 @@ struct options  save_options  ;
     // increase the buffersize with 50%
     int size=asmp-asmbuff;
     asmbuffSize=asmbuffSize*3/2;
-    asmbuff = Safe_realloc (asmbuff, asmbuffSize); 
+    asmbuff = realloc (asmbuff, asmbuffSize); 
     asmp=asmbuff+size;
   }
   *asmp++ = '\n' ;
@@ -170,16 +170,6 @@ struct options  save_options  ;
 "_naked"       { count(); TKEYWORD(NAKED); }
 "while"        { count(); return(WHILE); }
 "xdata"        { count(); TKEYWORD(XDATA); }
-"_data"	       { count(); TKEYWORD(_NEAR); }
-"_code"	       { count(); TKEYWORD(_CODE); }
-"_eeprom"      { count(); TKEYWORD(_EEPROM); }
-"_flash"       { count(); TKEYWORD(_CODE); }
-"_generic"     { count(); TKEYWORD(_GENERIC); }
-"_near"	       { count(); TKEYWORD(_NEAR); }
-"_sram"        { count(); TKEYWORD(_XDATA);}
-"_xdata"       { count(); TKEYWORD(_XDATA);}
-"_pdata"       { count(); TKEYWORD(_PDATA); }
-"_idata"       { count(); TKEYWORD(_IDATA); }
 "..."	       { count(); return(VAR_ARGS);}
 {L}({L}|{D})*  { count(); return(check_type()); }
 0[xX]{H}+{IS}? { count(); yylval.val = constVal(yytext); return(CONSTANT); }
@@ -298,7 +288,7 @@ int checkCurrFile ( char *s)
 	/* mark the end of the filename */
 	while (*s != '"') s++;
 	*s = '\0';
-	currFname = Safe_calloc(1,strlen(sb)+1);
+	currFname = malloc (strlen(sb)+1);
 	strcpy(currFname,sb);
 	lineno = yylineno = lNum;
     }
@@ -457,11 +447,11 @@ void doPragma (int op, char *cp)
 	    /* append to the functions already listed
 	       in callee-saves */
 	    for (; options.calleeSaves[i] ;i++);
-	    parseWithComma(&options.calleeSaves[i],strdup(cp));
+	    parseWithComma(&options.calleeSaves[i], Safe_strdup(cp));
 	}
 	break;
     case P_EXCLUDE:
-	parseWithComma(options.excludeRegs,strdup(cp));
+	parseWithComma(options.excludeRegs, Safe_strdup(cp));
 	break;
     case P_LOOPREV:
 	optimize.noLoopReverse = 1;