Skip to content

fix(store_queue): clear the queue when init_mem #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
poemonsense merged 1 commit into from
Oct 29, 2024
Merged

fix(store_queue): clear the queue when init_mem #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/memory/store_queue_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
extern "C" {
#endif

void store_queue_reset();
void store_queue_push(store_commit_t store_commit);
void store_queue_pop();
store_commit_t store_queue_fornt();
Expand Down
9 changes: 6 additions & 3 deletions src/memory/paddr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static inline void raise_read_access_fault(int type, vaddr_t vaddr) {
if (type == MEM_TYPE_IFETCH || type == MEM_TYPE_IFETCH_READ) {
cause = EX_IAF;
} else if (cpu.amo || type == MEM_TYPE_WRITE || type == MEM_TYPE_WRITE_READ) {
cause = EX_SAF;
cause = EX_SAF;
}
raise_access_fault(cause, vaddr);
}
Expand Down Expand Up @@ -187,6 +187,11 @@ void allocate_memory_with_mmap()

void init_mem() {
allocate_memory_with_mmap();

#ifdef CONFIG_DIFFTEST_STORE_COMMIT
store_queue_reset();
#endif

#ifdef CONFIG_MEM_RANDOM
srand(time(0));
uint32_t *p = (uint32_t *)pmem;
Expand Down Expand Up @@ -572,5 +577,3 @@ void dump_pmem() {
}
fwrite(pmem, sizeof(char), MEMORY_SIZE, fp);
}


4 changes: 4 additions & 0 deletions src/memory/store_queue_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

std::queue<store_commit_t> cpp_store_event_queue;

void store_queue_reset() {
cpp_store_event_queue = {};
}

void store_queue_push(store_commit_t store_commit) {
cpp_store_event_queue.push(store_commit);
}
Expand Down