Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to latest runtime version (v0.20220910.0). #371

Merged
merged 4 commits into from
Sep 11, 2022
Merged

Update to latest runtime version (v0.20220910.0). #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8844ffb
Recent Pony runtimes renamed `pony_become` to `ponyint_become`
mneumann Sep 10, 2022
6b4e721
Fix `ACTOR_PAD_SIZE`
mneumann Sep 10, 2022
475e017
Update to latest runtime version (`v0.20220910.0`).
jemc Sep 11, 2022
7aefeb3
Merge pull request #369 from mneumann/fix-pony-become-on-recent-runtime
jemc Sep 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ $(eval $(call MAKE_VAR_CACHE_FOR,LLVM_STATIC_RELEASE_URL))

# Specify where to download our pre-built runtime bitcode from.
# This needs to get bumped explicitly here when we do a new runtime build.
RUNTIME_BITCODE_RELEASE_URL?=https://github.com/savi-lang/runtime-bitcode/releases/download/v0.20220519.1
RUNTIME_BITCODE_RELEASE_URL?=https://github.com/savi-lang/runtime-bitcode/releases/download/v0.20220910.0
$(eval $(call MAKE_VAR_CACHE_FOR,RUNTIME_BITCODE_RELEASE_URL))

# This is the path where we look for the LLVM pre-built static libraries to be,
Expand Down
9 changes: 5 additions & 4 deletions src/savi/compiler/code_gen/ponyrt.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ class Savi::Compiler::CodeGen::PonyRT
# 52/104 bytes: heap
# 48/88 bytes: gc
# 28/0 bytes: padding to 64 bytes, ignored
ACTOR_PAD_SIZE = 248
# XXX: USE_RUNTIMESTATS -> 392
ACTOR_PAD_SIZE = 264
# TODO: adjust based on intptr size to account for 32-bit platforms:
# if INTPTR_MAX == INT64_MAX
# define ACTOR_PAD_SIZE 248
Expand Down Expand Up @@ -218,7 +219,7 @@ class Savi::Compiler::CodeGen::PonyRT
{"pony_init", [@i32, @pptr], @i32, [
LLVM::Attribute::NoUnwind, LLVM::Attribute::InaccessibleMemOrArgMemOnly,
]},
{"pony_become", [@ptr, @obj_ptr], @void, [
{"ponyint_become", [@ptr, @obj_ptr], @void, [
LLVM::Attribute::NoUnwind, LLVM::Attribute::InaccessibleMemOrArgMemOnly,
]},
{"pony_start", [@i1, @i32_ptr, @ptr], @i1, [
Expand Down Expand Up @@ -593,7 +594,7 @@ class Savi::Compiler::CodeGen::PonyRT
# TODO: Run module finalizers.

# Become nothing (stop being the main actor).
g.builder.call(g.mod.functions["pony_become"], [
g.builder.call(g.mod.functions["ponyint_become"], [
g.func_frame.alloc_ctx,
@obj_ptr.null,
])
Expand Down Expand Up @@ -680,7 +681,7 @@ class Savi::Compiler::CodeGen::PonyRT

if become_now
g.builder.call(
g.mod.functions["pony_become"],
g.mod.functions["ponyint_become"],
[g.gen_frame.alloc_ctx, allocated],
)
end
Expand Down