Browse Source

* cpu64bitaddr -> cpu64bitalu check to determine whether we need special
handling for 64 add-nodes
* call the generic ordinal handler for 64 add nodes on the JVM

git-svn-id: branches/jvmbackend@18518 -

Jonas Maebe 14 years ago
parent
commit
3e5b70d80d
2 changed files with 9 additions and 2 deletions
  1. 7 0
      compiler/jvm/njvmadd.pas
  2. 2 2
      compiler/nadd.pas

+ 7 - 0
compiler/jvm/njvmadd.pas

@@ -48,6 +48,7 @@ interface
           procedure second_cmpboolean;override;
           procedure second_cmpsmallset;override;
           procedure second_cmp64bit;override;
+          procedure second_add64bit; override;
           procedure second_cmpordinal;override;
        end;
 
@@ -348,6 +349,12 @@ interface
       end;
 
 
+    procedure tjvmaddnode.second_add64bit;
+      begin
+        second_opordinal;
+      end;
+
+
     procedure tjvmaddnode.second_cmpordinal;
       begin
         second_generic_compare;

+ 2 - 2
compiler/nadd.pas

@@ -2597,7 +2597,7 @@ implementation
                   internalerror(200103291);
                  expectloc:=LOC_FLAGS;
                end
-{$ifndef cpu64bitaddr}
+{$ifndef cpu64bitalu}
               { is there a 64 bit type ? }
              else if (torddef(ld).ordtype in [s64bit,u64bit,scurrency]) then
                begin
@@ -2609,7 +2609,7 @@ implementation
                   else
                     expectloc:=LOC_JUMP;
                end
-{$endif cpu64bitaddr}
+{$endif cpu64bitalu}
 {$ifndef cpuneedsmulhelper}
              { is there a cardinal? }
              else if (torddef(ld).ordtype=u32bit) then