From 55557eea92709776dd8faea4b533a0e187b18e54 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Thu, 5 Feb 2004 19:35:27 +0000
Subject: [PATCH]   * more x86-64 fixes

---
 compiler/ncgset.pas  | 26 +++++++++++++++++++-------
 compiler/ncgutil.pas |  7 +++++--
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/compiler/ncgset.pas b/compiler/ncgset.pas
index 90a6472549..f361d1bd01 100644
--- a/compiler/ncgset.pas
+++ b/compiler/ncgset.pas
@@ -642,6 +642,7 @@ implementation
              genitem(t^.less);
            if t^._low=t^._high then
              begin
+{$ifndef cpu64bit}
                 if opsize in [OS_S64,OS_64] then
                   begin
                      objectlibrary.getlabel(l1);
@@ -655,6 +656,7 @@ implementation
                      cg.a_label(exprasmlist,l1);
                   end
                 else
+{$endif cpu64bit}
                   begin
                      cg.a_cmp_const_reg_label(exprasmlist, opsize, OC_EQ, aword(t^._low),hregister, t^.statement);
                   end;
@@ -669,6 +671,7 @@ implementation
                 { ELSE-label                                }
                 if first or (t^._low-last>1) then
                   begin
+{$ifndef cpu64bit}
                      if opsize in [OS_64,OS_S64] then
                        begin
                           objectlibrary.getlabel(l1);
@@ -690,12 +693,13 @@ implementation
                           cg.a_label(exprasmlist,l1);
                        end
                      else
+{$endif cpu64bit}
                        begin
                         cg.a_cmp_const_reg_label(exprasmlist, opsize, jmp_lt, aword(t^._low), hregister,
                            elselabel);
                        end;
                   end;
-
+{$ifndef cpu64bit}
                 if opsize in [OS_S64,OS_64] then
                   begin
                      objectlibrary.getlabel(l1);
@@ -715,6 +719,7 @@ implementation
                     cg.a_label(exprasmlist,l1);
                   end
                 else
+{$endif cpu64bit}
                   begin
                      cg.a_cmp_const_reg_label(exprasmlist, opsize, jmp_le, aword(t^._high), hregister, t^.statement);
                   end;
@@ -850,13 +855,15 @@ implementation
          opsize:=def_cgsize(left.resulttype.def);
          { copy the case expression to a register }
          location_force_reg(exprasmlist,left.location,opsize,false);
+{$ifndef cpu64bit}
          if opsize in [OS_S64,OS_64] then
-          begin
-            hregister:=left.location.registerlow;
-            hregister2:=left.location.registerhigh;
-          end
+           begin
+             hregister:=left.location.registerlow;
+             hregister2:=left.location.registerhigh;
+           end
          else
-          hregister:=left.location.register;
+{$endif cpu64bit}
+           hregister:=left.location.register;
          if isjump then
           begin
             truelabel:=otl;
@@ -871,9 +878,11 @@ implementation
          load_all_regvars(exprasmlist);
 {$endif OLDREGVARS}
          { now generate the jumps }
+{$ifndef cpu64bit}
          if opsize in [OS_64,OS_S64] then
            genlinearcmplist(nodes)
          else
+{$endif cpu64bit}
            begin
               if cs_optimize in aktglobalswitches then
                 begin
@@ -1008,7 +1017,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.57  2004-01-31 23:37:07  florian
+  Revision 1.58  2004-02-05 19:35:27  florian
+    * more x86-64 fixes
+
+  Revision 1.57  2004/01/31 23:37:07  florian
     * another improvement to tcginnode.pass_2
 
   Revision 1.56  2004/01/31 17:45:17  peter
diff --git a/compiler/ncgutil.pas b/compiler/ncgutil.pas
index 507fb8c8a5..fa40cd121d 100644
--- a/compiler/ncgutil.pas
+++ b/compiler/ncgutil.pas
@@ -306,7 +306,7 @@ implementation
         cg.deallocexplicitregisters(list,R_INTREGISTER,paramanager.get_volatile_registers_int(pocall_default));
 
         cg.g_exception_reason_save(list, href);
-        cg.a_cmp_const_reg_label(list,OS_S32,OC_NE,0,NR_FUNCTION_RESULT_REG,exceptlabel);
+        cg.a_cmp_const_reg_label(list,OS_S32,OC_NE,0,cg.makeregsize(NR_FUNCTION_RESULT_REG,OS_S32),exceptlabel);
      end;
 
 
@@ -2137,7 +2137,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.190  2004-02-05 01:24:08  florian
+  Revision 1.191  2004-02-05 19:35:27  florian
+    * more x86-64 fixes
+
+  Revision 1.190  2004/02/05 01:24:08  florian
     * several fixes to compile x86-64 system
 
   Revision 1.189  2004/02/04 22:15:15  daniel