Merge branch 'bug-fix-main-test' into 'develop'

use main_test.c for tests

See merge request !31

src/linkutils/aot.rs

@@ -103,7 +103,7 @@ pub fn link_test_primordial(funcs: Vec<MuName>, out: &str, vm: &VM) -> PathBuf {
         ret.push(get_path_for_mu_context(vm));
 
         // copy primoridal entry
-        let source = get_path_under_zebu(runtime::PRIMORDIAL_ENTRY);
+        let source = get_path_under_zebu(runtime::TEST_PRIMORDIAL_ENTRY);
         let dest = {
             let mut ret = PathBuf::from(&vm.vm_options.flag_aot_emit_dir);
             ret.push("main_test.c");

src/runtime/main_test.c

 // Copyright 2017 The Australian National University
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,15 @@ extern void* rodal_realloc(void*, size_t);
 
 extern uint32_t mu_retval;
 
+extern void* STRUCT_TAG_MAP;
+extern void* HYBRID_TAG_MAP;
+extern void* STRUCT_TAG_MAP_LOC;
+extern void* HYBRID_TAG_MAP_LOC;
+
 int main(int argc, char** argv) {
+    STRUCT_TAG_MAP_LOC = &STRUCT_TAG_MAP;
+    HYBRID_TAG_MAP_LOC = &HYBRID_TAG_MAP;
+
     rodal_init_deallocate();
     mu_main(&RODAL_END, &vm, argc, argv);
     assert(mu_retval == 0);
@@ -35,4 +43,4 @@ int main(int argc, char** argv) {
 }
 
 void free(void* ptr) { return rodal_free(ptr); };
-void* realloc(void* ptr, size_t s) { return rodal_realloc(ptr, s); };
+void* realloc(void* ptr, size_t s) { return rodal_realloc(ptr, s); };
\ No newline at end of file