mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-21 23:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

update readme and fix always playing str (#1139)

Browse Source 
* update readme deps

* replace assert

* bump timeout

* fix memory corruption in kernel

* use unknown if level name is invalid
This commit is contained in:
water111
2022-02-08 19:02:47 -05:00
committed by GitHub
parent 3f394ef4d6
commit 78cde74d5a
243 changed files with 3525 additions and 3503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goalc/debugger/Debugger.cpp
+25 -25
View File
@@ -12,7 +12,7 @@
#include "goalc/emitter/Register.h"
#include "goalc/listener/Listener.h"
#include "third-party/fmt/core.h"
#include "common/util/assert.h"
#include "common/util/Assert.h"
/*!
* Is the target halted? If we don't know or aren't connected, returns false.
@@ -208,7 +208,7 @@ InstructionPointerInfo Debugger::get_rip_info(u64 rip) {
result.function_offset = obj_offset - info->offset_in_seg;
result.func_debug = info;
assert(!info->instructions.empty());
ASSERT(!info->instructions.empty());
}
}
}
@@ -369,7 +369,7 @@ Disassembly Debugger::disassemble_at_rip(const InstructionPointerInfo& info) {
FunctionDebugInfo* func_info = info.func_debug;
std::string name = func_info->name;
auto continue_info = get_continue_info(rip);
assert(!func_info->instructions.empty());
ASSERT(!func_info->instructions.empty());
std::vector<u8> function_mem;
function_mem.resize(func_info->instructions.back().offset +
@@ -438,7 +438,7 @@ void Debugger::update_break_info() {
* Waits for break to be acknowledged and reads break info.
*/
bool Debugger::do_break() {
assert(is_valid() && is_attached() && is_running());
ASSERT(is_valid() && is_attached() && is_running());
m_expecting_immeidate_break = true;
m_continue_info.valid = false;
clear_signal_queue();
@@ -446,7 +446,7 @@ bool Debugger::do_break() {
return false;
} else {
auto info = pop_signal();
assert(info.kind == xdbg::SignalInfo::BREAK);
ASSERT(info.kind == xdbg::SignalInfo::BREAK);
update_break_info();
m_running = false;
return true;
@@ -457,22 +457,22 @@ bool Debugger::do_break() {
* Continue the target, must be attached and stopped.
*/
bool Debugger::do_continue() {
assert(is_valid() && is_attached() && is_halted());
ASSERT(is_valid() && is_attached() && is_halted());
if (!m_regs_valid) {
update_break_info();
}
assert(regs_valid());
ASSERT(regs_valid());
if (!m_continue_info.valid) {
update_continue_info();
}
assert(m_continue_info.valid);
ASSERT(m_continue_info.valid);
m_regs_valid = false;
if (m_continue_info.subtract_1) {
m_regs_at_break.rip--;
auto result = xdbg::set_regs_now(m_debug_context.tid, m_regs_at_break);
assert(result);
ASSERT(result);
}
m_expecting_immeidate_break = false;
@@ -488,12 +488,12 @@ bool Debugger::do_continue() {
* Read memory from an attached and halted target.
*/
bool Debugger::read_memory(u8* dest_buffer, int size, u32 goal_addr) const {
assert(is_valid() && is_attached() && is_halted());
ASSERT(is_valid() && is_attached() && is_halted());
return xdbg::read_goal_memory(dest_buffer, size, goal_addr, m_debug_context, m_memory_handle);
}
bool Debugger::read_memory_if_safe(u8* dest_buffer, int size, u32 goal_addr) const {
assert(is_valid() && is_attached() && is_halted());
ASSERT(is_valid() && is_attached() && is_halted());
if (goal_addr >= EE_MAIN_MEM_LOW_PROTECT && goal_addr + size < EE_MAIN_MEM_SIZE) {
return read_memory(dest_buffer, size, goal_addr);
}
@@ -504,7 +504,7 @@ bool Debugger::read_memory_if_safe(u8* dest_buffer, int size, u32 goal_addr) con
* Write the memory of an attached and halted target.
*/
bool Debugger::write_memory(const u8* src_buffer, int size, u32 goal_addr) {
assert(is_valid() && is_attached() && is_halted());
ASSERT(is_valid() && is_attached() && is_halted());
return xdbg::write_goal_memory(src_buffer, size, goal_addr, m_debug_context, m_memory_handle);
}
@@ -512,7 +512,7 @@ bool Debugger::write_memory(const u8* src_buffer, int size, u32 goal_addr) {
* Read the GOAL Symbol table from an attached and halted target.
*/
void Debugger::read_symbol_table() {
assert(is_valid() && is_attached() && is_halted());
ASSERT(is_valid() && is_attached() && is_halted());
u32 bytes_read = 0;
u32 reads = 0;
Timer timer;
@@ -581,8 +581,8 @@ void Debugger::read_symbol_table() {
// GOAL sym - s7
auto sym_offset = s32(offset + st_base + BASIC_OFFSET) - s32(m_debug_context.s7);
assert(sym_offset >= INT16_MIN);
assert(sym_offset <= INT16_MAX);
ASSERT(sym_offset >= INT16_MIN);
ASSERT(sym_offset <= INT16_MAX);
std::string str(str_buff);
if (str.length() >= 50) {
@@ -601,7 +601,7 @@ void Debugger::read_symbol_table() {
} else {
fmt::print("Symbol {} (#x{:x}) appears multiple times!\n", str, sym_offset);
continue;
// assert(false);
// ASSERT(false);
}
}
@@ -611,7 +611,7 @@ void Debugger::read_symbol_table() {
}
}
assert(m_symbol_offset_to_name_map.size() == m_symbol_name_to_offset_map.size());
ASSERT(m_symbol_offset_to_name_map.size() == m_symbol_name_to_offset_map.size());
fmt::print("Read symbol table ({} bytes, {} reads, {} symbols, {:.2f} ms)\n", bytes_read, reads,
m_symbol_name_to_offset_map.size(), timer.getMs());
}
@@ -621,7 +621,7 @@ void Debugger::read_symbol_table() {
* Returns 0 if the symbol doesn't exist.
*/
u32 Debugger::get_symbol_address(const std::string& sym_name) {
assert(is_valid());
ASSERT(is_valid());
auto kv = m_symbol_name_to_offset_map.find(sym_name);
if (kv != m_symbol_name_to_offset_map.end()) {
return m_debug_context.s7 + kv->second;
@@ -633,7 +633,7 @@ u32 Debugger::get_symbol_address(const std::string& sym_name) {
* Get the value of a symbol by name. Returns if the symbol exists and populates output if it does.
*/
bool Debugger::get_symbol_value(const std::string& sym_name, u32* output) {
assert(is_valid());
ASSERT(is_valid());
auto kv = m_symbol_name_to_value_map.find(sym_name);
if (kv != m_symbol_name_to_value_map.end()) {
*output = kv->second;
@@ -646,7 +646,7 @@ bool Debugger::get_symbol_value(const std::string& sym_name, u32* output) {
* Get the value of a symbol by name. Returns NULL if symbol does not exist.
*/
const char* Debugger::get_symbol_name_from_offset(s32 ofs) const {
assert(is_valid());
ASSERT(is_valid());
auto kv = m_symbol_offset_to_name_map.find(ofs);
if (kv != m_symbol_offset_to_name_map.end()) {
return kv->second.c_str();
@@ -682,7 +682,7 @@ void Debugger::start_watcher() {
if (m_watcher_running) {
stop_watcher();
}
assert(!m_watcher_running);
ASSERT(!m_watcher_running);
m_watcher_running = true;
m_watcher_should_stop = false;
{
@@ -696,7 +696,7 @@ void Debugger::start_watcher() {
* Stops the debugger watch thread (waits for it to end)
*/
void Debugger::stop_watcher() {
assert(m_watcher_running);
ASSERT(m_watcher_running);
m_watcher_running = false;
m_watcher_should_stop = true;
m_watcher_thread.join();
@@ -762,7 +762,7 @@ void Debugger::watcher() {
#endif
default:
printf("[Debugger] unhandled signal in watcher: %d\n", int(signal_info.kind));
assert(false);
ASSERT(false);
}
{
@@ -802,7 +802,7 @@ Debugger::SignalInfo Debugger::pop_signal() {
Debugger::SignalInfo result;
if (!try_pop_signal(&result)) {
assert(false);
ASSERT(false);
}
return result;
}
@@ -962,7 +962,7 @@ std::string Debugger::disassemble_x86_with_symbols(int len, u64 base_addr) const
result.replace(pos + 1, read + sym_val_string.length() - 1,
sym_str); // the [ is ignored (result is something like: [identity])
pos += sym_str.length() + 1;
assert(result.at(pos) == ']'); // maybe?
ASSERT(result.at(pos) == ']'); // maybe?
} else {
// symbol not found for whatever reason, just use regular disassembly and skip over
pos += 1;