* x86-64 compilation fixed

compiler/x86/agx86att.pas

@@ -224,7 +224,7 @@ interface
 {$ifdef x86_64}
        as_x86_64_as_info : tasminfo =
           (
-            id     : as_x86_64_as;
+            id     : as_gas;
             idtxt  : 'AS';
             asmbin : 'as';
             asmcmd : '-o $OBJ $ASM';
@@ -293,7 +293,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.11  2003-11-12 16:05:40  florian
+  Revision 1.12  2003-12-24 00:33:10  florian
+    * x86-64 compilation fixed
+
+  Revision 1.11  2003/11/12 16:05:40  florian
     * assembler readers OOPed
     + typed currency constants
     + typed 128 bit float constants if the CPU supports it

compiler/x86_64/cpupi.pas

@@ -29,10 +29,10 @@ unit cpupi;
   interface
 
     uses
-       cgbase;
+       psub,procinfo;
 
     type
-       tx86_64procinfo = class(tprocinfo)
+       tx86_64procinfo = class(tcgprocinfo)
        end;
 
 
@@ -43,7 +43,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.1  2003-01-05 13:36:54  florian
+  Revision 1.2  2003-12-24 00:33:10  florian
+    * x86-64 compilation fixed
+
+  Revision 1.1  2003/01/05 13:36:54  florian
     * x86-64 compiles
     + very basic support for float128 type (x86-64 only)
 }

compiler/x86_64/cputarg.pas

@@ -41,7 +41,7 @@ implementation
       ,t_linux
     {$endif}
     {$ifndef NOTARGETFREEBSD}
-      ,t_fbsd
+      ,t_bsd
     {$endif}
     {$ifndef NOTARGETWIN32}
       ,t_win32
@@ -62,7 +62,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.4  2003-04-30 15:45:35  florian
+  Revision 1.5  2003-12-24 00:33:10  florian
+    * x86-64 compilation fixed
+
+  Revision 1.4  2003/04/30 15:45:35  florian
     * merged more x86-64/i386 code
 
   Revision 1.3  2002/09/07 15:25:15  peter

compiler/x86_64/nx64cnv.pas

@@ -53,7 +53,6 @@ interface
          { procedure second_pchar_to_string;override; }
          { procedure second_class_to_intf;override;  }
          { procedure second_char_to_char;override; }
-           procedure second_call_helper(c : tconverttype);override;
        end;
 
 
@@ -62,118 +61,27 @@ implementation
    uses
       verbose,systems,globtype,
       symconst,symdef,aasmbase,aasmtai,aasmcpu,
-      cginfo,cgbase,pass_2,
+      cgbase,pass_2,
       ncon,ncal,ncnv,
       cpubase,
       cgobj,cga,tgobj,rgobj,rgcpu,ncgutil;
 
+
     procedure tx86_64typeconvnode.second_int_to_real;
       begin
          internalerror(200304305);
       end;
 
 
-    procedure tx86_64typeconvnode.second_call_helper(c : tconverttype);
-{$ifdef fpc}
-      const
-         secondconvert : array[tconverttype] of pointer = (
-           @second_nothing, {equal}
-           @second_nothing, {not_possible}
-           @second_nothing, {second_string_to_string, handled in resulttype pass }
-           @second_char_to_string,
-           @second_nothing, {char_to_charray}
-           @second_nothing, { pchar_to_string, handled in resulttype pass }
-           @second_nothing, {cchar_to_pchar}
-           @second_cstring_to_pchar,
-           @second_ansistring_to_pchar,
-           @second_string_to_chararray,
-           @second_nothing, { chararray_to_string, handled in resulttype pass }
-           @second_array_to_pointer,
-           @second_pointer_to_array,
-           @second_int_to_int,
-           @second_int_to_bool,
-           @second_bool_to_bool,
-           @second_bool_to_int,
-           @second_real_to_real,
-           @second_int_to_real,
-           @second_nothing, { real_to_currency, handled in resulttype pass }
-           @second_proc_to_procvar,
-           @second_nothing, { arrayconstructor_to_set }
-           @second_nothing, { second_load_smallset, handled in first pass }
-           @second_cord_to_pointer,
-           @second_nothing, { interface 2 string }
-           @second_nothing, { interface 2 guid   }
-           @second_class_to_intf,
-           @second_char_to_char,
-           @second_nothing,  { normal_2_smallset }
-           @second_nothing,  { dynarray_2_openarray }
-           @second_nothing,  { pwchar_2_string }
-           @second_nothing,  { variant_2_dynarray }
-           @second_nothing   { dynarray_2_variant}
-         );
-      type
-         tprocedureofobject = procedure of object;
-
-      var
-         r : packed record
-                proc : pointer;
-                obj : pointer;
-             end;
-
-      begin
-         { this is a little bit dirty but it works }
-         { and should be quite portable too        }
-         r.proc:=secondconvert[c];
-         r.obj:=self;
-         tprocedureofobject(r)();
-      end;
-{$else fpc}
-     begin
-        case c of
-          tc_equal,
-          tc_not_possible,
-          tc_string_2_string : second_nothing;
-          tc_char_2_string : second_char_to_string;
-          tc_char_2_chararray : second_nothing;
-          tc_pchar_2_string : second_nothing;
-          tc_cchar_2_pchar : second_nothing;
-          tc_cstring_2_pchar : second_cstring_to_pchar;
-          tc_ansistring_2_pchar : second_ansistring_to_pchar;
-          tc_string_2_chararray : second_string_to_chararray;
-          tc_chararray_2_string : second_nothing;
-          tc_array_2_pointer : second_array_to_pointer;
-          tc_pointer_2_array : second_pointer_to_array;
-          tc_int_2_int : second_int_to_int;
-          tc_int_2_bool : second_int_to_bool;
-          tc_bool_2_bool : second_bool_to_bool;
-          tc_bool_2_int : second_bool_to_int;
-          tc_real_2_real : second_real_to_real;
-          tc_int_2_real : second_int_to_real;
-          tc_real_2_currency : second_nothing;
-          tc_proc_2_procvar : second_proc_to_procvar;
-          tc_arrayconstructor_2_set : second_nothing;
-          tc_load_smallset : second_nothing;
-          tc_cord_2_pointer : second_cord_to_pointer;
-          tc_intf_2_string : second_nothing;
-          tc_intf_2_guid : second_nothing;
-          tc_class_2_intf : second_class_to_intf;
-          tc_char_2_char : second_char_to_char;
-          tc_normal_2_smallset : second_nothing;
-          tc_dynarray_2_openarray : second_nothing;
-          tc_pwchar_2_string : second_nothing;
-          tc_variant_2_dynarray : second_nothing;
-          tc_dynarray_2_variant : second_nothing;
-          else internalerror(2002101101);
-        end;
-     end;
-{$endif fpc}
-
 begin
    ctypeconvnode:=tx86_64typeconvnode;
 end.
 {
   $Log$
-  Revision 1.1  2003-04-30 20:53:32  florian
+  Revision 1.2  2003-12-24 00:33:10  florian
+    * x86-64 compilation fixed
+
+  Revision 1.1  2003/04/30 20:53:32  florian
     * error when address of an abstract method is taken
     * fixed some x86-64 problems
     * merged some more x86-64 and i386 code