christoph/failnix
1
Fork 0
Code Releases Activity

don't link mmap region into .text but aot array itself

Browse Source
This commit is contained in:
Christoph Urlacher
2026-04-21 14:46:31 +02:00
parent ea56079c09
commit 264795bf71
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -322,14 +322,8 @@ rec {
domain = "gitea.local.chriphost.de"; domain = "gitea.local.chriphost.de";
owner = "christoph"; owner = "christoph";
repo = "wamr"; repo = "wamr";
rev = "4e7aed33fe53bf3ee4a3f2fe582c74816f850759";
# After placing mmap region in .text segment: hash = "sha256-/4BKwoFDRfkA+DmbWagxdtkCDAED5rxbz5e4xvjvVWU=";
rev = "1521011029b0531c02eb0142c239b7f85a3165b5";
hash = "sha256-/uLSank+Aacfj+SBliYTaD320cCA1lBRtSRALXErJGE=";
# Before placing mmap region in .text segment:
# rev = "fd69a4e76ec0d384bd79f514772b7dfa240fc0d7";
# hash = "sha256-rlCx4isI0k6rC9E0hWIA9LeinqiACug7zxj9z/e4SBQ=";
}; };
nativeBuildInputs = with pkgs; [cmake]; nativeBuildInputs = with pkgs; [cmake];

3
scripts/explore.pl
View File

@ -32,6 +32,9 @@ my $cui = TUI::init_cui();
# TODO: Add a TextEditor panel below the markers for notes. # TODO: Add a TextEditor panel below the markers for notes.
# Store notes in ./notes/benchmark-type-address.txt # Store notes in ./notes/benchmark-type-address.txt
# TODO: Add a more exhaustive faults query that also retrieves
# what fault has been injected. Then add an info popup or
# display it in the markers panel
# ============================================================================= # =============================================================================
# Data handling # Data handling

8
scripts/menu.pl
View File

@ -139,7 +139,13 @@ my %handlers = (
"$local_archive_dir/$selected_experiment/system.elf" ); "$local_archive_dir/$selected_experiment/system.elf" );
}, },
'13. Run Build in GDB' => sub { '13. Open Experiment in ResultBrowser' => sub {
# TODO: Select from existing DBs, rewrite db.conf,
# launch resultbrowser + firefox
},
'14. Run Build in GDB' => sub {
my @builds = grep { /linux/ } Util::find_subdirs($local_builds_dir); my @builds = grep { /linux/ } Util::find_subdirs($local_builds_dir);
my @selected_builds = my @selected_builds =
TUI::select_from_list( "Select Build to Run", 0, @builds ); TUI::select_from_list( "Select Build to Run", 0, @builds );

3
scripts/runner.pl
View File

@ -206,8 +206,7 @@ sub inject {
"-Wf,--state-dir=$remote_builds_dir/$experiment/state", "-Wf,--state-dir=$remote_builds_dir/$experiment/state",
"-Wf,--trap", "-Wf,--trap",
"-Wf,--catch-outerspace", "-Wf,--catch-outerspace",
"-Wf,--catch-write-textsegment",
# "-Wf,--catch-write-textsegment",
"-Wf,--timeout=500000", "-Wf,--timeout=500000",
"-Wf,--ok-marker=fail_marker_positive", "-Wf,--ok-marker=fail_marker_positive",
"-Wf,--fail-marker=fail_marker_negative", "-Wf,--fail-marker=fail_marker_negative",

3
scripts/wasm.just
View File

@ -97,6 +97,9 @@ build-wasm-aot module target="fail":
build-wasm-aot-array module: build-wasm-aot-array module:
{{ XXD }} -i {{ BUILD_DIR }}-{{ module }}/wasm_module.aot > {{ BUILD_DIR }}-{{ module }}/wasm_aot_array.c {{ XXD }} -i {{ BUILD_DIR }}-{{ module }}/wasm_module.aot > {{ BUILD_DIR }}-{{ module }}/wasm_aot_array.c
# Add __attribute__((section...)) to this array, so it is located into the .text.wamr_aot segment...
sed -i '1s/^/__attribute__((section(".text.wamr_aot"), aligned(4096)))\n/' {{ BUILD_DIR }}-{{ module }}/wasm_aot_array.c
[doc("WASM -> C-Array: Dump a WASM module to a binary array")] [doc("WASM -> C-Array: Dump a WASM module to a binary array")]
[group("1: build module")] [group("1: build module")]
build-wasm-interp-array module: build-wasm-interp-array module:

4
targets/linker.ld
View File

@ -51,8 +51,8 @@ SECTIONS {
/* Data and Stacks */ /* Data and Stacks */
/* NOTE: When including the WAMR mmap region inside .text, it has to be large */ /* NOTE: When including the WAMR mmap region inside .text, it has to be large */
/* . = 0x200000; */ . = 0x200000;
. = ALIGN(4096); /* . = ALIGN(4096); */
.data : { .data : {
KEEP (*(".startup_stack")) KEEP (*(".startup_stack"))
KEEP (*(".kernel_stack")) KEEP (*(".kernel_stack"))