Merge branch 'debian-gogogo' of https://github.com/RISCVERS/XiangShan into debian-gogogo

src/main/scala/xiangshan/cache/icache.scala

@@ -311,7 +311,7 @@ class ICache extends ICacheModule
 
   //physical address < 0x80000000
   //TODO: May have bugs
-  s2_access_fault := (s2_tlb_resp.paddr(31,0) < accessBorder.U(31,0)) && s2_valid
+  s2_access_fault := (s2_tlb_resp.paddr < accessBorder.U) && s2_valid
 
   // SRAM(Meta and Data) read reseponse
   val metas = metaArray.io.readResp

src/test/csrc/emu.cpp

@@ -194,7 +194,11 @@ inline void Emulator::single_cycle() {
 #ifdef WITH_DRAMSIM3
   axi_channel axi;
   axi_copy_from_dut_ptr(dut_ptr, axi);
+  axi.aw.addr -= 0x80000000UL;
+  axi.ar.addr -= 0x80000000UL;
   dramsim3_helper(axi);
+  axi.aw.addr += 0x80000000UL;
+  axi.ar.addr += 0x80000000UL;
   axi_set_dut_ptr(dut_ptr, axi);
 #endif