paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-06 16:50:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ added a block stack parameter to TAsmMapFunc

Browse Source
This commit is contained in:
Nikolay Nikolov 2023-10-16 20:55:53 +03:00
parent 3f4c41b45f
commit e318348372
1 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
compiler/wasm32/aasmcpu.pas
View File

@ -41,7 +41,8 @@ uses
O_MOV_DEST = 0;
type
TAsmMapFunc = function(ai: tai): tai of object;
twasmstruc_stack = class;
TAsmMapFunc = function(ai: tai; blockstack: twasmstruc_stack): tai of object;
{ taicpu }
@ -78,7 +79,7 @@ uses
taicpu_wasm_structured_instruction = class(tai)
constructor Create;
procedure Map(f: TAsmMapFunc);virtual;abstract;
procedure Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);virtual;abstract;
end;
{ tai_wasmstruc_if }
@ -91,7 +92,7 @@ uses
constructor create_from(a_if_instr: taicpu; srclist: TAsmList);
destructor Destroy; override;
function getcopy:TLinkedListItem;override;
procedure Map(f: TAsmMapFunc);override;
procedure Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);override;
end;
{ tai_wasmstruc_block }
@ -103,7 +104,7 @@ uses
constructor create_from(a_block_instr: taicpu; srclist: TAsmList);
destructor Destroy; override;
function getcopy:TLinkedListItem;override;
procedure Map(f: TAsmMapFunc);override;
procedure Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);override;
end;
{ tai_wasmstruc_loop }
@ -115,7 +116,7 @@ uses
constructor create_from(a_loop_instr: taicpu; srclist: TAsmList);
destructor Destroy; override;
function getcopy:TLinkedListItem;override;
procedure Map(f: TAsmMapFunc);override;
procedure Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);override;
end;
{ tai_wasmstruc_try }
@ -129,7 +130,6 @@ uses
constructor internal_create(a_try_asmlist: TAsmList);
destructor Destroy; override;
function getcopy:TLinkedListItem;override;
procedure Map(f: TAsmMapFunc);override;
end;
{ tai_wasmstruc_try_delegate }
@ -140,6 +140,7 @@ uses
constructor internal_create(first_ins: taicpu; a_try_asmlist, srclist: TAsmList);
destructor Destroy; override;
function getcopy:TLinkedListItem;override;
procedure Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);override;
end;
{ tai_wasmstruc_try_catch }
@ -154,7 +155,7 @@ uses
constructor internal_create(first_ins: taicpu; a_try_asmlist, srclist: TAsmList);
destructor Destroy; override;
function getcopy:TLinkedListItem;override;
procedure Map(f: TAsmMapFunc);override;
procedure Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);override;
end;
{ twasmstruc_stack }
@ -263,6 +264,7 @@ uses
ogwasm;
function wasm_convert_first_item_to_structured(srclist: TAsmList): tai; forward;
procedure map_structured_asmlist_inner(l: TAsmList; f: TAsmMapFunc; blockstack: twasmstruc_stack); forward;
{ twasmstruc_stack }
@ -378,10 +380,12 @@ uses
getcopy:=p;
end;
procedure tai_wasmstruc_if.Map(f: TAsmMapFunc);
procedure tai_wasmstruc_if.Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);
begin
map_structured_asmlist(then_asmlist,f);
map_structured_asmlist(else_asmlist,f);
blockstack.push(self);
map_structured_asmlist_inner(then_asmlist,f,blockstack);
map_structured_asmlist_inner(else_asmlist,f,blockstack);
blockstack.pop;
end;
{ tai_wasmstruc_block }
@ -435,9 +439,11 @@ uses
getcopy:=p;
end;
procedure tai_wasmstruc_block.Map(f: TAsmMapFunc);
procedure tai_wasmstruc_block.Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);
begin
map_structured_asmlist(inner_asmlist,f);
blockstack.push(self);
map_structured_asmlist_inner(inner_asmlist,f,blockstack);
blockstack.pop;
end;
{ tai_wasmstruc_loop }
@ -491,9 +497,11 @@ uses
getcopy:=p;
end;
procedure tai_wasmstruc_loop.Map(f: TAsmMapFunc);
procedure tai_wasmstruc_loop.Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);
begin
map_structured_asmlist(inner_asmlist,f);
blockstack.push(self);
map_structured_asmlist_inner(inner_asmlist,f,blockstack);
blockstack.pop;
end;
{ tai_wasmstruc_try }
@ -555,11 +563,6 @@ uses
getcopy:=p;
end;
procedure tai_wasmstruc_try.Map(f: TAsmMapFunc);
begin
map_structured_asmlist(try_asmlist,f);
end;
{ tai_wasmstruc_try_catch }
constructor tai_wasmstruc_try_catch.internal_create(first_ins: taicpu; a_try_asmlist, srclist: TAsmList);
@ -677,14 +680,16 @@ uses
getcopy:=p;
end;
procedure tai_wasmstruc_try_catch.Map(f: TAsmMapFunc);
procedure tai_wasmstruc_try_catch.Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);
var
i: Integer;
begin
inherited;
blockstack.push(self);
map_structured_asmlist_inner(try_asmlist,f,blockstack);
for i:=low(catch_list) to high(catch_list) do
map_structured_asmlist(catch_list[i].asmlist,f);
map_structured_asmlist(catch_all_asmlist,f);
map_structured_asmlist_inner(catch_list[i].asmlist,f,blockstack);
map_structured_asmlist_inner(catch_all_asmlist,f,blockstack);
blockstack.pop;
end;
{ tai_wasmstruc_try_delegate }
@ -713,6 +718,13 @@ uses
getcopy:=p;
end;
procedure tai_wasmstruc_try_delegate.Map(f: TAsmMapFunc; blockstack: twasmstruc_stack);
begin
blockstack.push(self);
map_structured_asmlist_inner(try_asmlist,f,blockstack);
blockstack.pop;
end;
{ tai_globaltype }
constructor tai_globaltype.create(const aglobalname: string; atype: TWasmBasicType; aimmutable: boolean);
@ -2618,7 +2630,7 @@ uses
end;
procedure map_structured_asmlist(l: TAsmList; f: TAsmMapFunc);
procedure map_structured_asmlist_inner(l: TAsmList; f: TAsmMapFunc; blockstack: twasmstruc_stack);
var
p, q: tai;
begin
@ -2627,11 +2639,11 @@ uses
begin
if p.typ=ait_wasm_structured_instruction then
begin
taicpu_wasm_structured_instruction(p).Map(f);
taicpu_wasm_structured_instruction(p).Map(f,blockstack);
end
else
begin
q:=f(p);
q:=f(p,blockstack);
if q<>p then
begin
l.InsertAfter(q,p);
@ -2645,6 +2657,15 @@ uses
end;
procedure map_structured_asmlist(l: TAsmList; f: TAsmMapFunc);
var
blockstack: twasmstruc_stack;
begin
blockstack:=twasmstruc_stack.create;
map_structured_asmlist_inner(l,f,blockstack);
blockstack.free;
end;
initialization
cai_cpu:=taicpu;
cai_align:=tai_align;