Browse Source

* wasm compilation fixed after sync with trunk

git-svn-id: branches/wasm@46217 -
nickysn 5 years ago
parent
commit
035a946168
5 changed files with 48 additions and 10 deletions
  1. 1 0
      .gitattributes
  2. 1 0
      compiler/wasm/agbinaryen.pas
  3. 1 0
      compiler/wasm/agwat.pas
  4. 0 10
      compiler/wasm/cpupara.pas
  5. 45 0
      compiler/wasm/tripletcpu.pas

+ 1 - 0
.gitattributes

@@ -992,6 +992,7 @@ compiler/wasm/rwasmstd.inc svneol=native#text/plain
 compiler/wasm/rwasmsup.inc svneol=native#text/plain
 compiler/wasm/symcpu.pas svneol=native#text/plain
 compiler/wasm/tgcpu.pas svneol=native#text/plain
+compiler/wasm/tripletcpu.pas svneol=native#text/plain
 compiler/wasm/wasmdef.pas svneol=native#text/plain
 compiler/wasm/wasmreg.dat svneol=native#text/plain
 compiler/widestr.pas svneol=native#text/plain

+ 1 - 0
compiler/wasm/agbinaryen.pas

@@ -593,6 +593,7 @@ implementation
          supported_targets : [system_wasm_wasm32];
          flags : [];
          labelprefix : 'L';
+         labelmaxlen : -1;
          comment : ';; ';
          dollarsign : '$';
        );

+ 1 - 0
compiler/wasm/agwat.pas

@@ -1085,6 +1085,7 @@ implementation
          supported_targets : [system_wasm_wasm32];
          flags : [];
          labelprefix : 'L';
+         labelmaxlen : -1;
          comment : ';; ';
          dollarsign : '$';
        );

+ 0 - 10
compiler/wasm/cpupara.pas

@@ -40,10 +40,6 @@ interface
         function  keep_para_array_range(varspez: tvarspez; def: tdef; calloption: tproccalloption): boolean; override;
         function  push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
         function  push_size(varspez: tvarspez; def: tdef; calloption: tproccalloption): longint;override;
-        {Returns a structure giving the information on the storage of the parameter
-        (which must be an integer parameter)
-        @param(nr Parameter number of routine, starting from 1)}
-        procedure getintparaloc(list: TAsmList; pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);override;
         function  create_paraloc_info(p : TAbstractProcDef; side: tcallercallee):longint;override;
         function  create_varargs_paraloc_info(p : tabstractprocdef; side: tcallercallee; varargspara:tvarargsparalist):longint;override;
         function  get_funcretloc(p : tabstractprocdef; side: tcallercallee; forcetempdef: tdef): tcgpara;override;
@@ -66,12 +62,6 @@ implementation
       hlcgobj;
 
 
-    procedure tcpuparamanager.GetIntParaLoc(list: TAsmList; pd : tabstractprocdef; nr : longint; var cgpara : tcgpara);
-      begin
-        { not yet implemented/used }
-        internalerror(2010121001);
-      end;
-
     function tcpuparamanager.get_saved_registers_int(calloption: tproccalloption): tcpuregisterarray;
       const
         { dummy, not used for WebAssembly }

+ 45 - 0
compiler/wasm/tripletcpu.pas

@@ -0,0 +1,45 @@
+{
+    Copyright (c) 2020 by Jonas Maebe
+
+    Construct the cpu part of the triplet
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ ****************************************************************************
+}
+unit tripletcpu;
+
+{$i fpcdefs.inc}
+
+interface
+
+uses
+  globtype;
+
+function tripletcpustr(tripletstyle: ttripletstyle): ansistring;
+
+implementation
+
+uses
+  globals, cpuinfo;
+
+function tripletcpustr(tripletstyle: ttripletstyle): ansistring;
+  begin
+    result:='wasm';
+  end;
+
+
+end.
+