From e67870564880fbe5796141f87327522421cab0f2 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Mon, 12 Apr 2004 18:59:32 +0000
Subject: [PATCH]   * small x86_64 fixes

---
 compiler/aasmtai.pas |  7 +++++--
 compiler/aggas.pas   | 11 +++++++----
 compiler/pexpr.pas   |  7 +++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/compiler/aasmtai.pas b/compiler/aasmtai.pas
index c91aae8da7..1e709be0c5 100644
--- a/compiler/aasmtai.pas
+++ b/compiler/aasmtai.pas
@@ -210,7 +210,7 @@ interface
                   ait_stabn,ait_stabs,ait_stab_function_name,
 {$endif GDB}
                   ait_cut,ait_marker,ait_align,ait_section,ait_comment,
-                  ait_const_8bit,ait_const_16bit,ait_const_32bit,
+                  ait_const_8bit,ait_const_16bit,ait_const_32bit,ait_const_64bit,
                   ait_real_32bit,ait_real_64bit,ait_real_80bit,ait_comp_64bit,ait_real_128bit,
                   ait_non_lazy_symbol_pointer
                   ];
@@ -2009,7 +2009,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.81  2004-03-16 22:12:10  florian
+  Revision 1.82  2004-04-12 18:59:32  florian
+    * small x86_64 fixes
+
+  Revision 1.81  2004/03/16 22:12:10  florian
     * some alignment issues resolved
     * compiler doesn't generate anymore instructions not supported by the linux fpe
 
diff --git a/compiler/aggas.pas b/compiler/aggas.pas
index 49068e7cb6..444aff8ab6 100644
--- a/compiler/aggas.pas
+++ b/compiler/aggas.pas
@@ -199,8 +199,8 @@ var
 
 
     const
-      ait_const2str : array[ait_const_32bit..ait_const_8bit] of string[8]=
-       (#9'.long'#9,#9'.short'#9,#9'.byte'#9);
+      ait_const2str : array[ait_const_64bit..ait_const_8bit] of string[8]=
+       (#9'.quad'#9,#9'.long'#9,#9'.short'#9,#9'.byte'#9);
 
 
     function ait_section2str(s:TSection):string;
@@ -321,7 +321,6 @@ var
       hp:=tai(p.first);
       while assigned(hp) do
        begin
-
          if not(hp.typ in SkipLineInfo) then
           begin
             hp1 := hp as tailineinfo;
@@ -461,6 +460,7 @@ var
                AsmWriteln('');
              end;
 
+           ait_const_64bit,
            ait_const_32bit,
            ait_const_16bit,
            ait_const_8bit :
@@ -882,7 +882,10 @@ var
 end.
 {
   $Log$
-  Revision 1.48  2004-03-17 22:27:41  florian
+  Revision 1.49  2004-04-12 18:59:32  florian
+    * small x86_64 fixes
+
+  Revision 1.48  2004/03/17 22:27:41  florian
     * fixed handling of doubles in a native arm compiler
     * fixed handling of typed double constants on arm
 
diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index 1018a29922..664abc80d8 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -1888,7 +1888,7 @@ implementation
                if code=0 then
                  begin
                     consume(_INTCONST);
-                    int_to_type(card,htype);
+                    int_to_type(ic,htype);
                     p1:=cordconstnode.create(ic,htype,true);
                  end;
 {$else cpu64bit}
@@ -2399,7 +2399,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.152  2004-03-29 14:42:52  peter
+  Revision 1.153  2004-04-12 18:59:32  florian
+    * small x86_64 fixes
+
+  Revision 1.152  2004/03/29 14:42:52  peter
     * variant array support
 
   Revision 1.151  2004/03/23 22:34:49  peter