|
@@ -49,9 +49,9 @@ interface
|
|
|
|
|
|
|
|
{ TWatAssembler }
|
|
{ TWatAssembler }
|
|
|
|
|
|
|
|
- { TWabtTextAssembler }
|
|
|
|
|
|
|
+ { TWasaTextAssembler }
|
|
|
|
|
|
|
|
- TWabtTextAssembler=class(texternalassembler)
|
|
|
|
|
|
|
+ TWasaTextAssembler=class(texternalassembler)
|
|
|
protected
|
|
protected
|
|
|
dataofs : integer;
|
|
dataofs : integer;
|
|
|
|
|
|
|
@@ -91,10 +91,10 @@ interface
|
|
|
{ TWatInstrWriter }
|
|
{ TWatInstrWriter }
|
|
|
|
|
|
|
|
TWatInstrWriter = class
|
|
TWatInstrWriter = class
|
|
|
- constructor create(_owner: TWabtTextAssembler);
|
|
|
|
|
|
|
+ constructor create(_owner: TWasaTextAssembler);
|
|
|
procedure WriteInstruction(hp : tai); virtual;
|
|
procedure WriteInstruction(hp : tai); virtual;
|
|
|
protected
|
|
protected
|
|
|
- owner: TWabtTextAssembler;
|
|
|
|
|
|
|
+ owner: TWasaTextAssembler;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
implementation
|
|
implementation
|
|
@@ -215,9 +215,9 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- { TWabtTextAssembler }
|
|
|
|
|
|
|
+ { TWasaTextAssembler }
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteOutGlobalInt32(const aname: string;
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteOutGlobalInt32(const aname: string;
|
|
|
val: integer; isconst: boolean);
|
|
val: integer; isconst: boolean);
|
|
|
begin
|
|
begin
|
|
|
writer.AsmWrite(#9);
|
|
writer.AsmWrite(#9);
|
|
@@ -233,7 +233,7 @@ implementation
|
|
|
writer.AsmWriteLn(')');
|
|
writer.AsmWriteLn(')');
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteInstruction(hp: tai);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteInstruction(hp: tai);
|
|
|
var
|
|
var
|
|
|
cpu : taicpu;
|
|
cpu : taicpu;
|
|
|
i : integer;
|
|
i : integer;
|
|
@@ -294,7 +294,7 @@ implementation
|
|
|
writer.AsmLn;
|
|
writer.AsmLn;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteProcDef(pd: tprocdef; stub: Boolean; stubUnreachable: Boolean);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteProcDef(pd: tprocdef; stub: Boolean; stubUnreachable: Boolean);
|
|
|
var
|
|
var
|
|
|
i : integer;
|
|
i : integer;
|
|
|
begin
|
|
begin
|
|
@@ -336,7 +336,7 @@ implementation
|
|
|
writer.AsmLn;
|
|
writer.AsmLn;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteProcParams(pd: tprocdef);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteProcParams(pd: tprocdef);
|
|
|
var
|
|
var
|
|
|
i : integer;
|
|
i : integer;
|
|
|
prm : tcpuparavarsym;
|
|
prm : tcpuparavarsym;
|
|
@@ -368,7 +368,7 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteProcResult(pd: tprocdef);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteProcResult(pd: tprocdef);
|
|
|
var
|
|
var
|
|
|
bt : TWasmBasicType;
|
|
bt : TWasmBasicType;
|
|
|
begin
|
|
begin
|
|
@@ -392,7 +392,7 @@ implementation
|
|
|
writer.AsmLn;
|
|
writer.AsmLn;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteTree(p: TAsmList);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteTree(p: TAsmList);
|
|
|
var
|
|
var
|
|
|
ch : char;
|
|
ch : char;
|
|
|
hp : tai;
|
|
hp : tai;
|
|
@@ -640,7 +640,7 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteAsmList;
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteAsmList;
|
|
|
var
|
|
var
|
|
|
hal : tasmlisttype;
|
|
hal : tasmlisttype;
|
|
|
begin
|
|
begin
|
|
@@ -685,7 +685,7 @@ implementation
|
|
|
writer.AsmLn;
|
|
writer.AsmLn;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- function TWabtTextAssembler.DoAssemble: boolean;
|
|
|
|
|
|
|
+ function TWasaTextAssembler.DoAssemble: boolean;
|
|
|
var
|
|
var
|
|
|
t : tcmdstr;
|
|
t : tcmdstr;
|
|
|
begin
|
|
begin
|
|
@@ -704,13 +704,13 @@ implementation
|
|
|
Message1(exec_e_util_not_found,'wasmtool');
|
|
Message1(exec_e_util_not_found,'wasmtool');
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- constructor TWabtTextAssembler.CreateWithWriter(info: pasminfo;
|
|
|
|
|
|
|
+ constructor TWasaTextAssembler.CreateWithWriter(info: pasminfo;
|
|
|
wr: TExternalAssemblerOutputFile; freewriter, smart: boolean);
|
|
wr: TExternalAssemblerOutputFile; freewriter, smart: boolean);
|
|
|
begin
|
|
begin
|
|
|
inherited CreateWithWriter(info, wr, freewriter, smart);
|
|
inherited CreateWithWriter(info, wr, freewriter, smart);
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteSymtableProcdefs(st: TSymtable);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteSymtableProcdefs(st: TSymtable);
|
|
|
var
|
|
var
|
|
|
i : longint;
|
|
i : longint;
|
|
|
def : tdef;
|
|
def : tdef;
|
|
@@ -743,7 +743,7 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteSymtableVarSyms(st: TSymtable);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteSymtableVarSyms(st: TSymtable);
|
|
|
var
|
|
var
|
|
|
i : integer;
|
|
i : integer;
|
|
|
sym : tsym;
|
|
sym : tsym;
|
|
@@ -791,7 +791,7 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteTempAlloc(p: TAsmList);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteTempAlloc(p: TAsmList);
|
|
|
var
|
|
var
|
|
|
hp: tai;
|
|
hp: tai;
|
|
|
tmp: array of tai_tempalloc;
|
|
tmp: array of tai_tempalloc;
|
|
@@ -850,7 +850,7 @@ implementation
|
|
|
|
|
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteExports(p: TAsmList);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteExports(p: TAsmList);
|
|
|
var
|
|
var
|
|
|
hp: tai;
|
|
hp: tai;
|
|
|
x: tai_export_name;
|
|
x: tai_export_name;
|
|
@@ -920,7 +920,7 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteUnitExports(st: TSymtable);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteUnitExports(st: TSymtable);
|
|
|
var
|
|
var
|
|
|
i : longint;
|
|
i : longint;
|
|
|
def : tdef;
|
|
def : tdef;
|
|
@@ -954,7 +954,7 @@ implementation
|
|
|
writer.AsmWriteLn(#9') ');
|
|
writer.AsmWriteLn(#9') ');
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteImports;
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteImports;
|
|
|
var
|
|
var
|
|
|
i : integer;
|
|
i : integer;
|
|
|
def : tdef;
|
|
def : tdef;
|
|
@@ -1006,7 +1006,7 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteOutPChar(p: pchar; ofs, len: integer);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteOutPChar(p: pchar; ofs, len: integer);
|
|
|
var
|
|
var
|
|
|
i : integer;
|
|
i : integer;
|
|
|
s : string;
|
|
s : string;
|
|
@@ -1027,7 +1027,7 @@ implementation
|
|
|
end;
|
|
end;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteConstString(lbl: tai_label;
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteConstString(lbl: tai_label;
|
|
|
str: tai_string);
|
|
str: tai_string);
|
|
|
var
|
|
var
|
|
|
i : integer;
|
|
i : integer;
|
|
@@ -1047,7 +1047,7 @@ implementation
|
|
|
inc(dataofs, str.len);
|
|
inc(dataofs, str.len);
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
- procedure TWabtTextAssembler.WriteConstants(p: TAsmList);
|
|
|
|
|
|
|
+ procedure TWasaTextAssembler.WriteConstants(p: TAsmList);
|
|
|
var
|
|
var
|
|
|
i : integer;
|
|
i : integer;
|
|
|
hp : tai;
|
|
hp : tai;
|
|
@@ -1077,7 +1077,7 @@ implementation
|
|
|
|
|
|
|
|
{ TWatInstrWriter }
|
|
{ TWatInstrWriter }
|
|
|
|
|
|
|
|
- constructor TWatInstrWriter.create(_owner: TWabtTextAssembler);
|
|
|
|
|
|
|
+ constructor TWatInstrWriter.create(_owner: TWasaTextAssembler);
|
|
|
begin
|
|
begin
|
|
|
inherited create;
|
|
inherited create;
|
|
|
owner := _owner;
|
|
owner := _owner;
|
|
@@ -1105,6 +1105,6 @@ implementation
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
initialization
|
|
initialization
|
|
|
- RegisterAssembler(as_wasm_wasa_info, TWabtTextAssembler);
|
|
|
|
|
|
|
+ RegisterAssembler(as_wasm_wasa_info, TWasaTextAssembler);
|
|
|
|
|
|
|
|
end.
|
|
end.
|
Nikolay Nikolov