#include "decode.h"
#include "trap.h"
#include "common.h"
+#include "config.h"
#include "processor.h"
-
-class processor_t;
+#include "memtracer.h"
+#include <vector>
// virtual memory configuration
typedef reg_t pte_t;
const reg_t PGSHIFT = 13;
const reg_t PGSIZE = 1 << PGSHIFT;
const reg_t PTIDXBITS = PGSHIFT - (sizeof(pte_t) == 8 ? 3 : 2);
+const reg_t VPN_BITS = PTIDXBITS * LEVELS;
const reg_t PPN_BITS = 8*sizeof(reg_t) - PGSHIFT;
+const reg_t VA_BITS = VPN_BITS + PGSHIFT;
// page table entry (PTE) fields
#define PTE_T 0x001 // Entry is a page Table descriptor
badvaddr = addr; \
throw trap_load_address_misaligned; \
} \
- void* paddr = translate(addr, false, false); \
- return *(type##_t*)paddr; \
+ reg_t paddr = translate(addr, sizeof(type##_t), false, false); \
+ return *(type##_t*)(mem + paddr); \
}
// load value from memory at aligned address; zero extend to register width
badvaddr = addr; \
throw trap_store_address_misaligned; \
} \
- void* paddr = translate(addr, true, false); \
- *(type##_t*)paddr = val; \
+ reg_t paddr = translate(addr, sizeof(type##_t), true, false); \
+ *(type##_t*)(mem + paddr) = val; \
}
// store value to memory at aligned address
store_func(uint32)
store_func(uint64)
+ struct insn_fetch_t
+ {
+ insn_t insn;
+ insn_func_t func;
+ };
+
// load instruction from memory at aligned address.
// (needed because instruction alignment requirement is variable
// if RVC is supported)
// returns the instruction at the specified address, given the current
// RVC mode. func is set to a pointer to a function that knows how to
// execute the returned instruction.
- insn_t __attribute__((always_inline)) load_insn(reg_t addr, bool rvc,
- insn_func_t* func)
+ inline insn_fetch_t load_insn(reg_t addr, bool rvc)
{
- insn_t insn;
-
#ifdef RISCV_ENABLE_RVC
if(addr % 4 == 2 && rvc) // fetch across word boundary
{
- void* addr_lo = translate(addr, false, true);
- insn.bits = *(uint16_t*)addr_lo;
-
- *func = processor_t::dispatch_table
- [insn.bits % processor_t::DISPATCH_TABLE_SIZE];
+ reg_t addr_lo = translate(addr, 2, false, true);
+ insn_fetch_t fetch;
+ fetch.insn.bits = *(uint16_t*)(mem + addr_lo);
+ fetch.func = get_insn_func(fetch.insn, sr);
- if(!INSN_IS_RVC(insn.bits))
+ if(!INSN_IS_RVC(fetch.insn.bits))
{
- void* addr_hi = translate(addr+2, false, true);
- insn.bits |= (uint32_t)*(uint16_t*)addr_hi << 16;
+ reg_t addr_hi = translate(addr+2, 2, false, true);
+ fetch.insn.bits |= (uint32_t)*(uint16_t*)(mem + addr_hi) << 16;
}
+ return fetch;
}
else
#endif
{
reg_t idx = (addr/sizeof(insn_t)) % ICACHE_ENTRIES;
- insn_t data = icache_data[idx];
- *func = icache_func[idx];
- if(likely(icache_tag[idx] == addr))
- return data;
-
- // the processor guarantees alignment based upon rvc mode
- void* paddr = translate(addr, false, true);
- insn = *(insn_t*)paddr;
-
- icache_tag[idx] = addr;
- icache_data[idx] = insn;
- icache_func[idx] = *func = processor_t::dispatch_table
- [insn.bits % processor_t::DISPATCH_TABLE_SIZE];
+ insn_fetch_t fetch;
+ if (unlikely(icache_tag[idx] != addr))
+ {
+ reg_t paddr = translate(addr, sizeof(insn_t), false, true);
+ fetch.insn = *(insn_t*)(mem + paddr);
+ fetch.func = get_insn_func(fetch.insn, sr);
+
+ reg_t idx = (paddr/sizeof(insn_t)) % ICACHE_ENTRIES;
+ icache_tag[idx] = addr;
+ icache_data[idx] = fetch.insn;
+ icache_func[idx] = fetch.func;
+
+ if (tracer.interested_in_range(paddr, paddr + sizeof(insn_t), false, true))
+ {
+ icache_tag[idx] = -1;
+ tracer.trace(paddr, sizeof(insn_t), false, true);
+ }
+ }
+ fetch.insn = icache_data[idx];;
+ fetch.func = icache_func[idx];
+ return fetch;
}
-
- return insn;
}
// get the virtual address that caused a fault
// get/set the page table base register
reg_t get_ptbr() { return ptbr; }
void set_ptbr(reg_t addr) { ptbr = addr & ~(PGSIZE-1); flush_tlb(); }
-
// keep the MMU in sync with processor mode
- void set_supervisor(bool sup) { supervisor = sup; }
- void set_vm_enabled(bool en) { vm_enabled = en; }
+ void set_sr(uint32_t _sr) { sr = _sr; }
// flush the TLB and instruction cache
void flush_tlb();
void flush_icache();
+ void register_memtracer(memtracer_t*);
+
private:
char* mem;
size_t memsz;
reg_t badvaddr;
-
reg_t ptbr;
- bool supervisor;
- bool vm_enabled;
+ uint32_t sr;
+ memtracer_list_t tracer;
// implement a TLB for simulator performance
static const reg_t TLB_ENTRIES = 256;
- long tlb_data[TLB_ENTRIES];
+ reg_t tlb_data[TLB_ENTRIES];
reg_t tlb_insn_tag[TLB_ENTRIES];
reg_t tlb_load_tag[TLB_ENTRIES];
reg_t tlb_store_tag[TLB_ENTRIES];
reg_t icache_tag[ICACHE_ENTRIES];
// finish translation on a TLB miss and upate the TLB
- void* refill(reg_t addr, bool store, bool fetch);
+ reg_t refill_tlb(reg_t addr, reg_t bytes, bool store, bool fetch);
// perform a page table walk for a given virtual address
pte_t walk(reg_t addr);
// translate a virtual address to a physical address
- void* translate(reg_t addr, bool store, bool fetch)
+ reg_t translate(reg_t addr, reg_t bytes, bool store, bool fetch)
{
reg_t idx = (addr >> PGSHIFT) % TLB_ENTRIES;
reg_t* tlb_tag = fetch ? tlb_insn_tag : store ? tlb_store_tag :tlb_load_tag;
reg_t expected_tag = addr & ~(PGSIZE-1);
if(likely(tlb_tag[idx] == expected_tag))
- return (void*)(((long)addr & (PGSIZE-1)) | tlb_data[idx]);
+ return ((uintptr_t)addr & (PGSIZE-1)) + tlb_data[idx];
- return refill(addr, store, fetch);
+ return refill_tlb(addr, bytes, store, fetch);
}
friend class processor_t;
projects / riscv-isa-sim.git / blobdiff