bugfixes from rebase

Author: grg-haas

examples/devshare/CMakeLists.txt

@@ -3,13 +3,8 @@ set(eapp_src eapp/devshare.c)
 set(host_bin devshare-runner)
 set(host_src host/host.cpp)
 set(package_name "devshare.ke")
-set(package_script "./devshare-runner devshare eyrie-rt")
-
-if(RISCV32)
-  set(eyrie_plugins "freemem io_syscall linux_syscall env_setup rv32")
-else()
-  set(eyrie_plugins "freemem io_syscall linux_syscall env_setup")
-endif()
+set(package_script "./devshare-runner devshare eyrie-rt loader.bin")
+set(eyrie_plugins "freemem io_syscall linux_syscall env_setup")
 
 # eapp
 
@@ -23,7 +18,7 @@ target_link_libraries(${host_bin} ${KEYSTONE_LIB_HOST} ${KEYSTONE_LIB_EDGE})
 
 # add target for Eyrie runtime (see keystone.cmake)
 
-set(eyrie_files_to_copy .options_log eyrie-rt)
+set(eyrie_files_to_copy .options_log eyrie-rt loader.bin)
 add_eyrie_runtime(${eapp_bin}-eyrie
   ${eyrie_plugins}
   ${eyrie_files_to_copy})

examples/devshare/host/host.cpp

@@ -9,9 +9,9 @@ int main(int argc, char **argv) {
   Params params;
 
   params.setFreeMemSize(1024 * 1024);
-  params.setUntrustedMem(DEFAULT_UNTRUSTED_PTR, 1024 * 1024);
+  params.setUntrustedSize(1024 * 1024);
 
-  enclave.init(argv[1], argv[2], params);
+  enclave.init(argv[1], argv[2], argv[3], params);
 
   enclave.registerOcallDispatch(incoming_call_dispatch);
   edge_call_init_internals(

runtime/loader-binary/CMakeLists.txt

@@ -3,7 +3,7 @@ set(LOADER_SOURCES loader.S loader-binary.c)
 set(LOADER_LINK_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/loader.lds)
 
 add_executable(loader ${LOADER_SOURCES})
-target_link_libraries(loader rt_call ld_mm rt_util rt_loader gcc)
+target_link_libraries(loader rt_call ld_mm rt_util rt_tmplib rt_loader gcc)
 target_link_options(loader PRIVATE -static -nostdlib -T ${LOADER_LINK_SCRIPT})
 
 add_custom_target(loader.bin ALL

runtime/mm/mm.c

@@ -3,6 +3,7 @@
 #include "mm/vm.h"
 #include "mm/freemem.h"
 #include "mm/paging.h"
+#include "util/rt_util.h"
 
 /* Page table utilities */
 static pte*

sm/src/platform/mpfs/platform.h

@@ -30,7 +30,7 @@ struct platform_enclave_data{
 #define NUM_DISABLED_DEVS       0
 
 // Search for FPGA devices
-#define DEV_SEARCH_BASE         "fabric-bus@40000000"
+#define DEV_SEARCH_BASE         "/fabric-bus@40000000"
 #define DEV_IGNORED             { "microchip,mpfs-ccc", "microchip,mpfs-qspi" }
 
 // Initialization functions