Procházet zdrojové kódy

+ made m68k to compile system unit again

git-svn-id: trunk@9017 -
Károly Balogh před 18 roky
rodič
revize
b91c0756c4
2 změnil soubory, kde provedl 8 přidání a 4 odebrání
  1. 6 2
      compiler/aggas.pas
  2. 2 2
      compiler/m68k/aasmcpu.pas

+ 6 - 2
compiler/aggas.pas

@@ -254,12 +254,16 @@ implementation
 { vtable for a class called Window:                                       }
 { .section .data.rel.ro._ZTV6Window,"awG",@progbits,_ZTV6Window,comdat    }
 {$warning TODO .data.ro not yet working}
-{$if defined(arm) or defined(powerpc)}
+{$if defined(arm) or defined(powerpc)} 
           '.rodata',
 {$else arm}
           '.data',
 {$endif arm}
-          '.rodata',
+{$if defined(m68k)} { Amiga/m68k GNU AS doesn't seem to like .rodata (KB) }
+          '.data',
+{$else}
+	  '.rodata',
+{$endif}
           '.bss',
           '.threadvar',
           '.pdata',

+ 2 - 2
compiler/m68k/aasmcpu.pas

@@ -513,7 +513,7 @@ type
       begin
         case opcode of
           A_MOVE, A_MOVEQ, A_ADD, A_ADDQ, A_ADDX, A_SUB, A_SUBQ,
-          A_AND, A_LSR, A_LSL, A_ASR, A_ASL, A_EOR, A_EORI:
+          A_AND, A_LSR, A_LSL, A_ASR, A_ASL, A_EOR, A_EORI, A_OR:
             if opnr=1 then begin
               result:=operand_write;
             end else begin
@@ -521,7 +521,7 @@ type
             end;
           A_TST,A_CMP,A_CMPI:
             result:=operand_read;
-          A_CLR,A_NEG,A_SXX:
+          A_CLR, A_NEG, A_SXX, A_EXT:
             result:=operand_write;
           else begin
 {$WARNING FIX ME!!! remove ugly debug code ... }