Browse Source

* fix getdatalabel labeltype

git-svn-id: trunk@1251 -
peter 20 years ago
parent
commit
cba3aad3ba
1 changed files with 4 additions and 4 deletions
  1. 4 4
      compiler/aasmbase.pas

+ 4 - 4
compiler/aasmbase.pas

@@ -348,17 +348,17 @@ implementation
 
 
     constructor tasmlabel.createlocal(nr:longint;ltyp:TAsmLabelType);
     constructor tasmlabel.createlocal(nr:longint;ltyp:TAsmLabelType);
       begin;
       begin;
+        inherited create(target_asm.labelprefix+asmlabeltypeprefix[ltyp]+tostr(nr),AB_LOCAL,AT_FUNCTION);
         labelnr:=nr;
         labelnr:=nr;
         labeltype:=ltyp;
         labeltype:=ltyp;
-        inherited create(target_asm.labelprefix+asmlabeltypeprefix[labeltype]+tostr(labelnr),AB_LOCAL,AT_FUNCTION);
         is_set:=false;
         is_set:=false;
       end;
       end;
 
 
 
 
     constructor tasmlabel.createglobal(const modulename:string;nr:longint;ltyp:TAsmLabelType);
     constructor tasmlabel.createglobal(const modulename:string;nr:longint;ltyp:TAsmLabelType);
       begin;
       begin;
+        inherited create('_$'+modulename+'$_L'+asmlabeltypeprefix[ltyp]+tostr(nr),AB_GLOBAL,AT_DATA);
         labelnr:=nr;
         labelnr:=nr;
-        inherited create('_$'+modulename+'$_L'+asmlabeltypeprefix[labeltype]+tostr(labelnr),AB_GLOBAL,AT_DATA);
         labeltype:=ltyp;
         labeltype:=ltyp;
         is_set:=false;
         is_set:=false;
         { write it always }
         { write it always }
@@ -935,8 +935,8 @@ implementation
 
 
     procedure TAsmLibraryData.getdatalabel(var l : tasmlabel);
     procedure TAsmLibraryData.getdatalabel(var l : tasmlabel);
       begin
       begin
-        l:=tasmlabel.createglobal(name,nextlabelnr[alt_addr],alt_addr);
-        inc(nextlabelnr[alt_addr]);
+        l:=tasmlabel.createglobal(name,nextlabelnr[alt_data],alt_data);
+        inc(nextlabelnr[alt_data]);
         symbolsearch.insert(l);
         symbolsearch.insert(l);
       end;
       end;