diff options
| author | Drahflow <drahflow@gmx.de> | 2015-05-31 22:14:32 +0200 |
|---|---|---|
| committer | Drahflow <drahflow@gmx.de> | 2015-05-31 22:14:32 +0200 |
| commit | 8e587569dc0e17dd58848e29d679400b69276c4b (patch) | |
| tree | 6db0878c61a1b03eb4d11f1f8ec69e1d67e389ff | |
| parent | 30d0ce33136b06ba804790951c4a26194aac06fa (diff) | |
Unified INITIALSCOPESIZE
| -rw-r--r-- | compiler/elymasAsmLib.ey | 6 | ||||
| -rw-r--r-- | compiler/elymasGlobal.ey | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/compiler/elymasAsmLib.ey b/compiler/elymasAsmLib.ey index 2d3fe88..19513c7 100644 --- a/compiler/elymasAsmLib.ey +++ b/compiler/elymasAsmLib.ey @@ -95,6 +95,10 @@ 4096 16 mul 8 mul ==ALLOCCHUNKSIZE # minimum ALLOCCHUNKSIZE # 4096 16 mul 8 mul 64 mul ==ALLOCCHUNKSIZE # FIXME: there is still some wonkyness with freezing + 4 ==INITIALSCOPESIZE + 1 ==INITIALEXTENSIONSIZE + 1 ==INITIALNAMETABLESIZE + 32 ==FREELISTCOUNT 4096 ==MARKANDSWEEPCOST @@ -1873,7 +1877,7 @@ 8 /r15 :subqImm8Reg /r14 /r15 :movqRegMem /r14 /rsi :movqRegReg - 2 /rdi :movqImmReg # FIXME: this should use INITIALSCOPESIZE + INITIALSCOPESIZE /rdi :movqImmReg internalAllocateScope /rax :movqImmReg /rax :callqReg /rax /r14 :movqRegReg diff --git a/compiler/elymasGlobal.ey b/compiler/elymasGlobal.ey index 6674cd1..2b7f2c1 100644 --- a/compiler/elymasGlobal.ey +++ b/compiler/elymasGlobal.ey @@ -9,10 +9,6 @@ { [ } "[[" deff { ] :labelResolve ::stringResolve } "]]" deff - 1 ==INITIALEXTENSIONSIZE - 2 ==INITIALSCOPESIZE - 1 ==INITIALNAMETABLESIZE - # elymas functions, stack based ABI 1 ==ARRAYMARKER @@ -148,7 +144,7 @@ /rsi /rsi :testqRegReg /nameTableExists :jnzLbl32 - INITIALNAMETABLESIZE /rdi :movqImmReg + ::INITIALNAMETABLESIZE /rdi :movqImmReg ::internalAllocateNametable /rax :movqImmReg /rax :callqReg @@ -223,7 +219,7 @@ /extensionAreaExists :jnzLbl8 /rdx :pushqReg - INITIALEXTENSIONSIZE 8 mul 8 add /rdi :movqImmReg + ::INITIALEXTENSIONSIZE 8 mul 8 add /rdi :movqImmReg ::internalAllocateAndZero /rax :movqImmReg /rax :callqReg /rdx :popqReg @@ -1090,7 +1086,7 @@ # create a new scope capturing the current one [ - INITIALSCOPESIZE /rdi :movqImmReg + ::INITIALSCOPESIZE /rdi :movqImmReg /r14 /rsi :movqRegReg ::internalAllocateScope /rax :movqImmReg /rax :callqReg @@ -3710,7 +3706,7 @@ { ==name [[ - INITIALSCOPESIZE /rdi :movqImmReg + ::INITIALSCOPESIZE /rdi :movqImmReg 8 /r15 :subqImm8Reg /r14 /r15 :movqRegMem # save scope /r14 /rsi :movqRegReg |