colin
/
risc-v-tlm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use real addresses in memory, extend memory size fo 0xFFFFFFFF

This commit is contained in:
Màrius Montón 2021-07-04 22:47:47 +02:00
parent 34a8f66035
commit 56c5203899
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/Memory.h
View File

@ -29,9 +29,8 @@ public:
// TLM-2 socket, defaults to 32-bits wide, base protocol // TLM-2 socket, defaults to 32-bits wide, base protocol
tlm_utils::simple_target_socket<Memory> socket; tlm_utils::simple_target_socket<Memory> socket;
//enum { SIZE = 0x90000000 };
enum { enum {
SIZE = 0x10000000 SIZE = 0xFFFFFFFF
}; };
const sc_core::sc_time LATENCY; const sc_core::sc_time LATENCY;

14
src/Memory.cpp
View File

@ -58,12 +58,6 @@ void Memory::b_transport(tlm::tlm_generic_payload &trans,
unsigned char *byt = trans.get_byte_enable_ptr(); unsigned char *byt = trans.get_byte_enable_ptr();
unsigned int wid = trans.get_streaming_width(); unsigned int wid = trans.get_streaming_width();
adr = adr - memory_offset;
// Obliged to check address range and check for unsupported features,
// i.e. byte enables, streaming, and bursts
// Can ignore extensions
// ********************************************* // *********************************************
// Generate the appropriate error response // Generate the appropriate error response
// ********************************************* // *********************************************
@ -168,8 +162,8 @@ void Memory::readHexFile(std::string const& filename) {
uint32_t address; uint32_t address;
byte_count = std::stoi(line.substr(1, 2), nullptr, 16); byte_count = std::stoi(line.substr(1, 2), nullptr, 16);
address = std::stoi(line.substr(3, 4), nullptr, 16); address = std::stoi(line.substr(3, 4), nullptr, 16);
address = address + extended_address; address = address + extended_address + memory_offset;
//cout << "00 address 0x" << hex << address << endl;
for (int i = 0; i < byte_count; i++) { for (int i = 0; i < byte_count; i++) {
mem[address + i] = stol(line.substr(9 + (i * 2), 2), mem[address + i] = stol(line.substr(9 + (i * 2), 2),
nullptr, 16); nullptr, 16);
@ -191,8 +185,8 @@ void Memory::readHexFile(std::string const& filename) {
} else if (line.substr(7, 2) == "04") { } else if (line.substr(7, 2) == "04") {
/* Start segment address */ /* Start segment address */
memory_offset = stol(line.substr(9, 4), nullptr, 16) << 16; memory_offset = stol(line.substr(9, 4), nullptr, 16) << 16;
extended_address = 0; extended_address = 0;
std::cout << "04 address set to 0x" << std::hex std::cout << "04 address set to 0x" << std::hex
<< extended_address << std::dec << std::endl; << extended_address << std::dec << std::endl;
std::cout << "04 offset set to 0x" << std::hex std::cout << "04 offset set to 0x" << std::hex
<< memory_offset << std::dec << std::endl; << memory_offset << std::dec << std::endl;