diff options
| author | John Högberg <[email protected]> | 2019-02-21 15:16:25 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-02-27 11:57:18 +0100 |
| commit | 7d92bbcfd3261b14c0850db34c76ab7a78f0d67b (patch) | |
| tree | 20b6c015673a40b37854342b0cd4c5f0f75613d4 /lib | |
| parent | 24a3eb5c7e3faa7e517e051f30bf241d6822232b (diff) | |
| download | otp-7d92bbcfd3261b14c0850db34c76ab7a78f0d67b.tar.gz otp-7d92bbcfd3261b14c0850db34c76ab7a78f0d67b.tar.bz2 otp-7d92bbcfd3261b14c0850db34c76ab7a78f0d67b.zip | |
beam_validator: Refactor stack allocation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compiler/src/beam_validator.erl | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl index 78003a8034..641a7f3dbc 100644 --- a/lib/compiler/src/beam_validator.erl +++ b/lib/compiler/src/beam_validator.erl @@ -439,13 +439,13 @@ valfun_1(_I, #vst{current=#st{ct=undecided}}) -> %% %% Allocate and deallocate, et.al valfun_1({allocate,Stk,Live}, Vst) -> - allocate(false, Stk, 0, Live, Vst); + allocate(uninitialized, Stk, 0, Live, Vst); valfun_1({allocate_heap,Stk,Heap,Live}, Vst) -> - allocate(false, Stk, Heap, Live, Vst); + allocate(uninitialized, Stk, Heap, Live, Vst); valfun_1({allocate_zero,Stk,Live}, Vst) -> - allocate(true, Stk, 0, Live, Vst); + allocate(initialized, Stk, 0, Live, Vst); valfun_1({allocate_heap_zero,Stk,Heap,Live}, Vst) -> - allocate(true, Stk, Heap, Live, Vst); + allocate(initialized, Stk, Heap, Live, Vst); valfun_1({deallocate,StkSize}, #vst{current=#st{numy=StkSize}}=Vst) -> verify_no_ct(Vst), deallocate(Vst); @@ -1112,20 +1112,23 @@ verify_arg_type(Lbl, Reg, GivenType, #vst{ft=Ft}) -> ok end. -allocate(Zero, Stk, Heap, Live, #vst{current=#st{numy=none}}=Vst0) -> +allocate(Tag, Stk, Heap, Live, #vst{current=#st{numy=none}=St}=Vst0) -> verify_live(Live, Vst0), - Vst = #vst{current=St} = prune_x_regs(Live, Vst0), - Ys = init_regs(Stk, case Zero of - true -> initialized; - false -> uninitialized - end), - heap_alloc(Heap, Vst#vst{current=St#st{y=Ys,numy=Stk}}); + Vst1 = Vst0#vst{current=St#st{numy=Stk}}, + Vst2 = prune_x_regs(Live, Vst1), + Vst = init_stack(Tag, Stk - 1, Vst2), + heap_alloc(Heap, Vst); allocate(_, _, _, _, #vst{current=#st{numy=Numy}}) -> error({existing_stack_frame,{size,Numy}}). deallocate(#vst{current=St}=Vst) -> Vst#vst{current=St#st{y=init_regs(0, initialized),numy=none}}. +init_stack(_Tag, -1, Vst) -> + Vst; +init_stack(Tag, Y, Vst) -> + init_stack(Tag, Y - 1, create_tag(Tag, allocate, [], {y,Y}, Vst)). + trim_stack(From, To, Top, #st{y=Ys0}=St) when From =:= Top -> Ys = foldl(fun(Y, Acc) -> gb_trees:delete(Y, Acc) |