RISC-V: set htif tohost port address using ELF symbol.

2 files changed, 12 insertions, 31 deletions

diff --git a/riscv/riscv_platform.c b/riscv/riscv_platform.c
index a16f7c88..758bf46f 100644
--- a/riscv/riscv_platform.c
+++ b/riscv/riscv_platform.c
@@ -12,47 +12,22 @@ bool plat_enable_misaligned_access(unit u)
 { return rv_enable_misaligned; }
 
 mach_bits plat_ram_base(unit u)
-{
-  fprintf(stderr, "plat_ram_base: -> %0" PRIx64 "\n", rv_ram_base);
-  return rv_ram_base;
-}
+{ return rv_ram_base; }
 
 mach_bits plat_ram_size(unit u)
-{
-  fprintf(stderr, "plat_ram_size: -> %0" PRIx64 "\n", rv_ram_size);
-  return rv_ram_size;
-}
+{ return rv_ram_size; }
 
 mach_bits plat_rom_base(unit u)
-{
-  fprintf(stderr, "plat_rom_base: -> %0" PRIx64 "\n", rv_rom_base);
-  return rv_rom_base;
-}
+{ return rv_rom_base; }
 
 mach_bits plat_rom_size(unit u)
-{
-  fprintf(stderr, "plat_rom_size: -> %0" PRIx64 "\n", rv_rom_size);
-  return rv_rom_size;
-}
+{ return rv_rom_size; }
 
 mach_bits plat_clint_base(unit u)
-{
-  fprintf(stderr, "plat_clint_base: -> %0" PRIx64 "\n", rv_clint_base);
-  return rv_clint_base;
-}
+{ return rv_clint_base; }
 
 mach_bits plat_clint_size(unit u)
-{
-  fprintf(stderr, "plat_clint_size: -> %0" PRIx64 "\n", rv_clint_size);
-  return rv_clint_size;
-}
-
-bool within_phys_mem(mach_bits addr, sail_int len)
-{
-  printf("within_phys_mem\n");
-  exit(EXIT_FAILURE);
-  return 0;
-}
+{ return rv_clint_size; }
 
 unit load_reservation(mach_bits addr)
 { return UNIT; }
diff --git a/riscv/riscv_sim.c b/riscv/riscv_sim.c
index ea6f7377..024bd71e 100644
--- a/riscv/riscv_sim.c
+++ b/riscv/riscv_sim.c
@@ -94,6 +94,12 @@ uint64_t load_sail(char *f)
     exit(1);
   }
   fprintf(stdout, "ELF Entry @ %lx\n", entry);
+  /* locate htif ports */
+  if (lookup_sym(f, "tohost", &rv_htif_tohost) < 0) {
+    fprintf(stderr, "Unable to locate htif tohost port.\n");
+    exit(1);
+  }
+  fprintf(stderr, "tohost located at %0" PRIx64 "\n", rv_htif_tohost);
   return entry;
 }