Commit 7540f00b authored by Isaac Oscar Gariano's avatar Isaac Oscar Gariano

Use new 'global_allocator' version of RODAL

parent fad24db1
...@@ -15,8 +15,8 @@ before_script: ...@@ -15,8 +15,8 @@ before_script:
build: build:
stage: build stage: build
script: script:
- rustc --version - rustup run nightly rustc --version
- time CARGO_HOME=.cargo RUST_BACKTRACE=1 CC=clang cargo test -j6 --release --no-run --color=always - time CARGO_HOME=.cargo RUST_BACKTRACE=1 CC=clang rustup run nightly cargo test -j6 --release --no-run --color=always
artifacts: artifacts:
paths: paths:
- target/release/libmu.so - target/release/libmu.so
......
...@@ -37,7 +37,7 @@ gcc = "*" ...@@ -37,7 +37,7 @@ gcc = "*"
mu_ast = {path = "src/ast"} mu_ast = {path = "src/ast"}
mu_utils = {path = "src/utils"} mu_utils = {path = "src/utils"}
#mu_gc = {path = "src/gc"} #mu_gc = {path = "src/gc"}
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "global_allocator", version = "^0.2.15" }
#rodal = { path = "./rodal", version = "*" } #rodal = { path = "./rodal", version = "*" }
libc="*" libc="*"
......
...@@ -26,5 +26,5 @@ lazy_static = "*" ...@@ -26,5 +26,5 @@ lazy_static = "*"
log = "*" log = "*"
simple_logger = "*" simple_logger = "*"
regex = "*" regex = "*"
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "global_allocator", version = "^0.2.15" }
#rodal = { path = "../../rodal", version = "*" } #rodal = { path = "../../rodal", version = "*" }
...@@ -39,5 +39,5 @@ simple_logger = "*" ...@@ -39,5 +39,5 @@ simple_logger = "*"
aligned_alloc = "*" aligned_alloc = "*"
crossbeam = "*" crossbeam = "*"
field-offset = "*" field-offset = "*"
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "global_allocator", version = "^0.2.15" }
#rodal = { path = "../../rodal", version = "*" } #rodal = { path = "../../rodal", version = "*" }
...@@ -36,10 +36,6 @@ int main(int argc, char** argv) { ...@@ -36,10 +36,6 @@ int main(int argc, char** argv) {
STRUCT_TAG_MAP_LOC = &STRUCT_TAG_MAP; STRUCT_TAG_MAP_LOC = &STRUCT_TAG_MAP;
HYBRID_TAG_MAP_LOC = &HYBRID_TAG_MAP; HYBRID_TAG_MAP_LOC = &HYBRID_TAG_MAP;
rodal_init_deallocate();
mu_main(&RODAL_END, &vm, argc, argv); mu_main(&RODAL_END, &vm, argc, argv);
return (int)mu_retval; return (int)mu_retval;
} }
\ No newline at end of file
void free(void* ptr) { return rodal_free(ptr); };
void* realloc(void* ptr, size_t s) { return rodal_realloc(ptr, s); };
\ No newline at end of file
...@@ -26,5 +26,5 @@ memsec = "0.1.9" ...@@ -26,5 +26,5 @@ memsec = "0.1.9"
byteorder = "*" byteorder = "*"
log = "*" log = "*"
doubly = "1.1.3" doubly = "1.1.3"
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "global_allocator", version = "^0.2.15" }
#rodal = { path = "../../rodal", version = "*" } #rodal = { path = "../../rodal", version = "*" }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment