Commit 4ca9d313 authored by johnvg@science.ru.nl's avatar johnvg@science.ru.nl

use PutSOutFile macro instead of FPuts (..,OutFile) in backend

parent 2583be7c
...@@ -167,8 +167,8 @@ static void GenLabel (Label label) ...@@ -167,8 +167,8 @@ static void GenLabel (Label label)
else else
FPrintF (OutFile,"%s%u",label->lab_pref,def->sdef_number); FPrintF (OutFile,"%s%u",label->lab_pref,def->sdef_number);
} else { } else {
FPutS (label->lab_pref,OutFile); PutSOutFile (label->lab_pref);
FPutS (label->lab_name,OutFile); PutSOutFile (label->lab_name);
} }
if (label->lab_post!=0) if (label->lab_post!=0)
FPrintF (OutFile,".%u",label->lab_post); FPrintF (OutFile,".%u",label->lab_post);
...@@ -202,8 +202,8 @@ static void GenDescriptorOrNodeEntryLabel (Label label) ...@@ -202,8 +202,8 @@ static void GenDescriptorOrNodeEntryLabel (Label label)
else else
FPrintF (OutFile,"%s%u",label->lab_pref,def->sdef_number); FPrintF (OutFile,"%s%u",label->lab_pref,def->sdef_number);
} else { } else {
FPutS (label->lab_pref,OutFile); PutSOutFile (label->lab_pref);
FPutS (label->lab_name,OutFile); PutSOutFile (label->lab_name);
} }
if (label->lab_post!=0) if (label->lab_post!=0)
FPrintF (OutFile,".%u",label->lab_post); FPrintF (OutFile,".%u",label->lab_post);
...@@ -221,7 +221,7 @@ static void GenPutWL (int offset) ...@@ -221,7 +221,7 @@ static void GenPutWL (int offset)
static void GenRelease (void) static void GenRelease (void)
{ {
FPutS ("\n\trelease", OutFile); PutSOutFile ("\n\trelease");
} }
static void TreatWaitListBeforeFill (int offset, FillKind fkind) static void TreatWaitListBeforeFill (int offset, FillKind fkind)
...@@ -652,14 +652,14 @@ static void put_instruction (char *instruction) ...@@ -652,14 +652,14 @@ static void put_instruction (char *instruction)
{ {
PutCOutFile ('\n'); PutCOutFile ('\n');
PutCOutFile ('\t'); PutCOutFile ('\t');
FPutS (instruction,OutFile); PutSOutFile (instruction);
} }
static void put_instruction_ (char *instruction) static void put_instruction_ (char *instruction)
{ {
PutCOutFile ('\n'); PutCOutFile ('\n');
PutCOutFile ('\t'); PutCOutFile ('\t');
FPutS (instruction,OutFile); PutSOutFile (instruction);
PutCOutFile (' '); PutCOutFile (' ');
} }
...@@ -706,21 +706,21 @@ static void put_directive (char *directive) ...@@ -706,21 +706,21 @@ static void put_directive (char *directive)
{ {
PutCOutFile ('\n'); PutCOutFile ('\n');
PutCOutFile ('.'); PutCOutFile ('.');
FPutS (directive,OutFile); PutSOutFile (directive);
} }
static void put_directive_ (char *directive) static void put_directive_ (char *directive)
{ {
PutCOutFile ('\n'); PutCOutFile ('\n');
PutCOutFile ('.'); PutCOutFile ('.');
FPutS (directive,OutFile); PutSOutFile (directive);
PutCOutFile (' '); PutCOutFile (' ');
} }
static void put_first_directive_ (char *directive) static void put_first_directive_ (char *directive)
{ {
PutCOutFile ('.'); PutCOutFile ('.');
FPutS (directive,OutFile); PutSOutFile (directive);
PutCOutFile (' '); PutCOutFile (' ');
} }
...@@ -871,9 +871,9 @@ void PushBasic (ObjectKind obj, SymbValue val) ...@@ -871,9 +871,9 @@ void PushBasic (ObjectKind obj, SymbValue val)
case BoolObj: case BoolObj:
put_instruction_ (IpushB); put_instruction_ (IpushB);
if (val.val_bool) if (val.val_bool)
FPutS ("TRUE", OutFile); PutSOutFile ("TRUE");
else else
FPutS ("FALSE", OutFile); PutSOutFile ("FALSE");
break; break;
case CharObj: case CharObj:
put_instruction_ (IpushC); put_instruction_ (IpushC);
...@@ -1299,11 +1299,11 @@ static void GenABCInstructions (Instructions ilist) ...@@ -1299,11 +1299,11 @@ static void GenABCInstructions (Instructions ilist)
PutCOutFile ('\n'); PutCOutFile ('\n');
if (instruction_name[0]==':') if (instruction_name[0]==':')
FPutS (&instruction_name[1],OutFile); PutSOutFile (&instruction_name[1]);
else { else {
if (instruction_name[0]!='.') if (instruction_name[0]!='.')
PutCOutFile ('\t'); PutCOutFile ('\t');
FPutS (instruction_name,OutFile); PutSOutFile (instruction_name);
} }
} }
} }
...@@ -1724,7 +1724,7 @@ void GenFill (Label symblab,int arity,Label contlab,int offset,FillKind fkind) ...@@ -1724,7 +1724,7 @@ void GenFill (Label symblab,int arity,Label contlab,int offset,FillKind fkind)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__n__b (arity); put_arguments__n__b (arity);
...@@ -1744,7 +1744,7 @@ void GenFillU (Label symblab,int a_size,int b_size,Label contlab,int offset) ...@@ -1744,7 +1744,7 @@ void GenFillU (Label symblab,int a_size,int b_size,Label contlab,int offset)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile," %d %d ",a_size,b_size); FPrintF (OutFile," %d %d ",a_size,b_size);
...@@ -1760,7 +1760,7 @@ void GenFillcp (Label symblab,int arity,Label contlab,int offset,char bits[]) ...@@ -1760,7 +1760,7 @@ void GenFillcp (Label symblab,int arity,Label contlab,int offset,char bits[])
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__n__b (arity); put_arguments__n__b (arity);
...@@ -1778,7 +1778,7 @@ void GenFillcpU (Label symblab,int a_size,int b_size,Label contlab,int offset,ch ...@@ -1778,7 +1778,7 @@ void GenFillcpU (Label symblab,int a_size,int b_size,Label contlab,int offset,ch
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile," %d %d ",a_size,b_size); FPrintF (OutFile," %d %d ",a_size,b_size);
...@@ -1798,7 +1798,7 @@ void GenFillh (Label symblab, int arity, int offset, FillKind fkind) ...@@ -1798,7 +1798,7 @@ void GenFillh (Label symblab, int arity, int offset, FillKind fkind)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__nn_b (arity,offset); put_arguments__nn_b (arity,offset);
...@@ -1814,7 +1814,7 @@ void GenFill1 (Label symblab,int arity,int offset,char bits[]) ...@@ -1814,7 +1814,7 @@ void GenFill1 (Label symblab,int arity,int offset,char bits[])
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile," %d %d %s",arity,offset,bits); FPrintF (OutFile," %d %d %s",arity,offset,bits);
} }
...@@ -1840,7 +1840,7 @@ void GenBuild (Label symblab,int arity,Label contlab) ...@@ -1840,7 +1840,7 @@ void GenBuild (Label symblab,int arity,Label contlab)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__n__b (arity); put_arguments__n__b (arity);
...@@ -1854,7 +1854,7 @@ void GenBuildh (Label symblab,int arity) ...@@ -1854,7 +1854,7 @@ void GenBuildh (Label symblab,int arity)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__n_b (arity); put_arguments__n_b (arity);
} }
...@@ -1866,7 +1866,7 @@ void GenBuildPartialFunctionh (Label symblab,int arity) ...@@ -1866,7 +1866,7 @@ void GenBuildPartialFunctionh (Label symblab,int arity)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__n_b (arity); put_arguments__n_b (arity);
} }
...@@ -1878,7 +1878,7 @@ void GenBuildU (Label symblab,int a_size,int b_size,Label contlab) ...@@ -1878,7 +1878,7 @@ void GenBuildU (Label symblab,int a_size,int b_size,Label contlab)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenDescriptorOrNodeEntryLabel (symblab); GenDescriptorOrNodeEntryLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile," %d %d ",a_size,b_size); FPrintF (OutFile," %d %d ",a_size,b_size);
...@@ -1944,7 +1944,7 @@ void GenBuildFieldSelector (Label symblab,Label contlab,char *record_name,int ar ...@@ -1944,7 +1944,7 @@ void GenBuildFieldSelector (Label symblab,Label contlab,char *record_name,int ar
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenFieldLabel (symblab,record_name); GenFieldLabel (symblab,record_name);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__n__b (arity); put_arguments__n__b (arity);
...@@ -1953,7 +1953,7 @@ void GenBuildFieldSelector (Label symblab,Label contlab,char *record_name,int ar ...@@ -1953,7 +1953,7 @@ void GenBuildFieldSelector (Label symblab,Label contlab,char *record_name,int ar
void GenFieldLabelDefinition (Label label,char *record_name) void GenFieldLabelDefinition (Label label,char *record_name)
{ {
FPutS ("\n", OutFile); PutSOutFile ("\n");
GenFieldLabel (label,record_name); GenFieldLabel (label,record_name);
} }
...@@ -1966,7 +1966,7 @@ void GenFillFieldSelector (Label symblab,Label contlab,char *record_name,int ari ...@@ -1966,7 +1966,7 @@ void GenFillFieldSelector (Label symblab,Label contlab,char *record_name,int ari
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenFieldLabel (symblab,record_name); GenFieldLabel (symblab,record_name);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
put_arguments__n__b (arity); put_arguments__n__b (arity);
...@@ -1986,7 +1986,7 @@ void GenFillR (Label symblab,int nr_a_args,int nr_b_args,int rootoffset,int a_of ...@@ -1986,7 +1986,7 @@ void GenFillR (Label symblab,int nr_a_args,int nr_b_args,int rootoffset,int a_of
if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
if (nr_a_args==0) if (nr_a_args==0)
a_offset=0; a_offset=0;
...@@ -2010,7 +2010,7 @@ void GenFill1R (Label symblab,int n_a_args,int n_b_args,int rootoffset,char bits ...@@ -2010,7 +2010,7 @@ void GenFill1R (Label symblab,int n_a_args,int n_b_args,int rootoffset,char bits
if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile, " %d %d %d %s",n_a_args,n_b_args,rootoffset,bits); FPrintF (OutFile, " %d %d %d %s",n_a_args,n_b_args,rootoffset,bits);
} }
...@@ -2022,7 +2022,7 @@ void GenFill2R (Label symblab,int n_a_args,int n_b_args,int rootoffset,char bits ...@@ -2022,7 +2022,7 @@ void GenFill2R (Label symblab,int n_a_args,int n_b_args,int rootoffset,char bits
if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile, " %d %d %d %s",n_a_args,n_b_args,rootoffset,bits); FPrintF (OutFile, " %d %d %d %s",n_a_args,n_b_args,rootoffset,bits);
} }
...@@ -2034,7 +2034,7 @@ void GenFill3R (Label symblab,int n_a_args,int n_b_args,int rootoffset,char bits ...@@ -2034,7 +2034,7 @@ void GenFill3R (Label symblab,int n_a_args,int n_b_args,int rootoffset,char bits
if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (! symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile, " %d %d %d %s",n_a_args,n_b_args,rootoffset,bits); FPrintF (OutFile, " %d %d %d %s",n_a_args,n_b_args,rootoffset,bits);
} }
...@@ -2046,7 +2046,7 @@ void GenBuildhr (Label symblab,int nr_a_args,int nr_b_args) ...@@ -2046,7 +2046,7 @@ void GenBuildhr (Label symblab,int nr_a_args,int nr_b_args)
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
FPrintF (OutFile, " %d %d",nr_a_args,nr_b_args); FPrintF (OutFile, " %d %d",nr_a_args,nr_b_args);
} }
...@@ -2058,7 +2058,7 @@ void GenBuildR (Label symblab,int nr_a_args,int nr_b_args,int a_offset,int b_off ...@@ -2058,7 +2058,7 @@ void GenBuildR (Label symblab,int nr_a_args,int nr_b_args,int a_offset,int b_off
if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol)) if (!symblab->lab_issymbol || DescriptorNeeded (symblab->lab_symbol))
GenLabel (symblab); GenLabel (symblab);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
if (nr_a_args==0) if (nr_a_args==0)
a_offset=0; a_offset=0;
...@@ -2353,7 +2353,7 @@ void GenCreateChannel (char *code) ...@@ -2353,7 +2353,7 @@ void GenCreateChannel (char *code)
void GenNewP (void) void GenNewP (void)
{ {
FPutS ("\n\tnewP", OutFile); PutSOutFile ("\n\tnewP");
} }
void SetContinue (int offset) void SetContinue (int offset)
...@@ -2432,7 +2432,7 @@ void GenImport (SymbDef sdef) ...@@ -2432,7 +2432,7 @@ void GenImport (SymbDef sdef)
if (sdef->sdef_calledwithrootnode) if (sdef->sdef_calledwithrootnode)
FPrintF (OutFile, " e_%s_" EA_PREFIX "%s.%s",sdef->sdef_module,record_name,name); FPrintF (OutFile, " e_%s_" EA_PREFIX "%s.%s",sdef->sdef_module,record_name,name);
else if (sdef->sdef_returnsnode) else if (sdef->sdef_returnsnode)
FPutS (" _",OutFile); PutSOutFile (" _");
} }
return; return;
case RECORDTYPE: case RECORDTYPE:
...@@ -2485,7 +2485,7 @@ void GenImport (SymbDef sdef) ...@@ -2485,7 +2485,7 @@ void GenImport (SymbDef sdef)
if (sdef->sdef_calledwithrootnode) if (sdef->sdef_calledwithrootnode)
FPrintF (OutFile, " e_%s_" EA_PREFIX "%s",sdef->sdef_module,name); FPrintF (OutFile, " e_%s_" EA_PREFIX "%s",sdef->sdef_module,name);
else else
FPutS (" _",OutFile); PutSOutFile (" _");
} }
} }
} }
...@@ -2628,7 +2628,7 @@ void GenNodeEntryDirective (int arity,Label label,Label label2) ...@@ -2628,7 +2628,7 @@ void GenNodeEntryDirective (int arity,Label label,Label label2)
if (DescriptorNeeded (label->lab_symbol)) if (DescriptorNeeded (label->lab_symbol))
GenDescriptorOrNodeEntryLabel (label); GenDescriptorOrNodeEntryLabel (label);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
if (label2){ if (label2){
PutCOutFile (' '); PutCOutFile (' ');
...@@ -2655,7 +2655,7 @@ void GenApplyInstanceEntryDirective (int arity,Label label,Label label2) ...@@ -2655,7 +2655,7 @@ void GenApplyInstanceEntryDirective (int arity,Label label,Label label2)
put_directive_b (ai); put_directive_b (ai);
put_arguments_n__b (arity); put_arguments_n__b (arity);
if (label==NULL) if (label==NULL)
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
else else
GenLabel (label); GenLabel (label);
PutCOutFile (' '); PutCOutFile (' ');
...@@ -2671,7 +2671,7 @@ void GenLazyRecordNodeEntryDirective (int arity,Label label,Label label2) ...@@ -2671,7 +2671,7 @@ void GenLazyRecordNodeEntryDirective (int arity,Label label,Label label2)
if (DescriptorNeeded (label->lab_symbol)) if (DescriptorNeeded (label->lab_symbol))
GenLabel (label); GenLabel (label);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
if (label2){ if (label2){
PutCOutFile (' '); PutCOutFile (' ');
...@@ -2718,7 +2718,7 @@ void GenNodeEntryDirectiveUnboxed (int a_size,int b_size,Label label,Label label ...@@ -2718,7 +2718,7 @@ void GenNodeEntryDirectiveUnboxed (int a_size,int b_size,Label label,Label label
if (DescriptorNeeded (label->lab_symbol)) if (DescriptorNeeded (label->lab_symbol))
GenDescriptorOrNodeEntryLabel (label); GenDescriptorOrNodeEntryLabel (label);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
if (label2){ if (label2){
PutCOutFile (' '); PutCOutFile (' ');
...@@ -2743,12 +2743,12 @@ void GenFieldNodeEntryDirective (int arity,Label label,Label label2,char *record ...@@ -2743,12 +2743,12 @@ void GenFieldNodeEntryDirective (int arity,Label label,Label label2,char *record
if (DescriptorNeeded (label->lab_symbol)) if (DescriptorNeeded (label->lab_symbol))
GenFieldLabel (label,record_name); GenFieldLabel (label,record_name);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
if (label2!=NULL){ if (label2!=NULL){
PutCOutFile (' '); PutCOutFile (' ');
if (label2==&empty_lab) if (label2==&empty_lab)
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
else else
GenFieldLabel (label2,record_name); GenFieldLabel (label2,record_name);
} }
...@@ -3418,7 +3418,7 @@ void GenModuleDescriptor ( ...@@ -3418,7 +3418,7 @@ void GenModuleDescriptor (
if (WriteModificationTimes){ if (WriteModificationTimes){
PutCOutFile (' '); PutCOutFile (' ');
PutCOutFile ('\"'); PutCOutFile ('\"');
FPutS (file_time,OutFile); PutSOutFile (file_time);
PutCOutFile ('\"'); PutCOutFile ('\"');
} }
#endif #endif
...@@ -3437,7 +3437,7 @@ void GenDepend (char *modname ...@@ -3437,7 +3437,7 @@ void GenDepend (char *modname
if (WriteModificationTimes){ if (WriteModificationTimes){
PutCOutFile (' '); PutCOutFile (' ');
PutCOutFile ('\"'); PutCOutFile ('\"');
FPutS (file_time,OutFile); PutSOutFile (file_time);
PutCOutFile ('\"'); PutCOutFile ('\"');
} }
#endif #endif
...@@ -3473,17 +3473,17 @@ void GenStart (SymbDef startsymb) ...@@ -3473,17 +3473,17 @@ void GenStart (SymbDef startsymb)
if (DoParallel) if (DoParallel)
FPrintF (OutFile,"e_%s_" D_PREFIX "%s.%u",CurrentModule,start_function_name,startsymb->sdef_number); FPrintF (OutFile,"e_%s_" D_PREFIX "%s.%u",CurrentModule,start_function_name,startsymb->sdef_number);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
else if (DoDebug){ else if (DoDebug){
if (DoParallel) if (DoParallel)
FPrintF (OutFile, D_PREFIX "%s.%u",start_function_name,startsymb->sdef_number); FPrintF (OutFile, D_PREFIX "%s.%u",start_function_name,startsymb->sdef_number);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
} else { } else {
if (DoParallel) if (DoParallel)
FPrintF (OutFile, LOCAL_D_PREFIX "%u",startsymb->sdef_number); FPrintF (OutFile, LOCAL_D_PREFIX "%u",startsymb->sdef_number);
else else
FPutS (empty_lab.lab_name, OutFile); PutSOutFile (empty_lab.lab_name);
} }
put_arguments__n__b (arity); put_arguments__n__b (arity);
...@@ -3504,7 +3504,7 @@ void GenStart (SymbDef startsymb) ...@@ -3504,7 +3504,7 @@ void GenStart (SymbDef startsymb)
GenDAStackLayout (1); GenDAStackLayout (1);
put_instruction_b (jmp); put_instruction_b (jmp);
FPutS ("_driver", OutFile); PutSOutFile ("_driver");
} }
} }
...@@ -3567,7 +3567,7 @@ void InitFileInfo (ImpMod imod) ...@@ -3567,7 +3567,7 @@ void InitFileInfo (ImpMod imod)
if (start_sdef!=NULL){ if (start_sdef!=NULL){
FPrintF (OutFile, "__%s_%s",start_sdef->sdef_module,start_sdef->sdef_name); FPrintF (OutFile, "__%s_%s",start_sdef->sdef_module,start_sdef->sdef_name);
} else } else
FPutS ("_nostart_", OutFile); PutSOutFile ("_nostart_");
} }
static int match_error_lab_used = 0; static int match_error_lab_used = 0;
...@@ -3605,7 +3605,7 @@ void GenNoMatchError (SymbDef sdef,int asp,int bsp,int string_already_generated) ...@@ -3605,7 +3605,7 @@ void GenNoMatchError (SymbDef sdef,int asp,int bsp,int string_already_generated)
if (DoStackLayout){ if (DoStackLayout){
put_directive_b (d); put_directive_b (d);
put_arguments_nn__b (0,2); put_arguments_nn__b (0,2);
FPutS ("ii",OutFile); PutSOutFile ("ii");
} }
GenJmp (&match_error_lab); GenJmp (&match_error_lab);
...@@ -3615,7 +3615,7 @@ void GenNoMatchError (SymbDef sdef,int asp,int bsp,int string_already_generated) ...@@ -3615,7 +3615,7 @@ void GenNoMatchError (SymbDef sdef,int asp,int bsp,int string_already_generated)
put_directive_ (Dstring); put_directive_ (Dstring);
FPrintF (OutFile, "x_%u \"",sdef->sdef_number); FPrintF (OutFile, "x_%u \"",sdef->sdef_number);
PrintSymbolOfIdent (sdef->sdef_name,0,OutFile); PrintSymbolOfIdent (sdef->sdef_name,0,OutFile);
FPutS ("\"", OutFile); PutSOutFile ("\"");
} }
} }
...@@ -3648,7 +3648,7 @@ void GenCaseNoMatchError (SymbDefP case_def,int asp,int bsp) ...@@ -3648,7 +3648,7 @@ void GenCaseNoMatchError (SymbDefP case_def,int asp,int bsp)