Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-19 03:33:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
momo5502
2025-01-18 09:28:23 +01:00
parent 2044a3c4ab
commit e79d919bbb
5 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/windows-emulator/debugging/win_x64_gdb_stub_handler.hpp
View File

@@ -12,7 +12,7 @@ class win_x64_gdb_stub_handler : public x64_gdb_stub_handler
{
}
gdb_stub::gdb_action cont() override
gdb_stub::gdb_action run() override
{
try
{
@@ -26,7 +26,7 @@ class win_x64_gdb_stub_handler : public x64_gdb_stub_handler
return gdb_stub::gdb_action::resume;
}
gdb_stub::gdb_action stepi() override
gdb_stub::gdb_action singlestep() override
{
try
{
@@ -40,7 +40,7 @@ class win_x64_gdb_stub_handler : public x64_gdb_stub_handler
return gdb_stub::gdb_action::resume;
}
std::string get_target_description() const override
std::string get_target_description() override
{
return "i386:x86-64";
}

72
src/windows-emulator/debugging/x64_gdb_stub_handler.hpp
View File

@@ -68,7 +68,7 @@ class x64_gdb_stub_handler : public gdb_stub::gdb_stub_handler
~x64_gdb_stub_handler() override = default;
gdb_stub::gdb_action cont() override
gdb_stub::gdb_action run() override
{
try
{
@@ -82,7 +82,7 @@ class x64_gdb_stub_handler : public gdb_stub::gdb_stub_handler
return gdb_stub::gdb_action::resume;
}
gdb_stub::gdb_action stepi() override
gdb_stub::gdb_action singlestep() override
{
try
{
@@ -96,36 +96,26 @@ class x64_gdb_stub_handler : public gdb_stub::gdb_stub_handler
return gdb_stub::gdb_action::resume;
}
bool read_reg(const int regno, size_t* value) override
size_t get_register_count() override
{
*value = 0;
try
{
if (static_cast<size_t>(regno) >= gdb_registers.size())
{
return true;
}
this->emu_->read_register(gdb_registers[regno], value, sizeof(*value));
return true;
}
catch (...)
{
return true;
}
return gdb_registers.size();
}
bool write_reg(const int regno, const size_t value) override
size_t get_max_register_size() override
{
return 256 / 8;
}
bool read_register(const size_t reg, void* data, const size_t max_length) override
{
try
{
if (static_cast<size_t>(regno) >= gdb_registers.size())
if (reg >= gdb_registers.size())
{
return true;
return false;
}
this->emu_->write_register(gdb_registers[regno], &value, sizeof(value));
this->emu_->read_register(gdb_registers[reg], data, max_length);
return true;
}
catch (...)
@@ -134,16 +124,16 @@ class x64_gdb_stub_handler : public gdb_stub::gdb_stub_handler
}
}
bool read_mem(const size_t addr, const size_t len, void* val) override
{
return this->emu_->try_read_memory(addr, val, len);
}
bool write_mem(const size_t addr, const size_t len, void* val) override
bool write_register(const size_t reg, const void* data, const size_t size) override
{
try
{
this->emu_->write_memory(addr, val, len);
if (reg >= gdb_registers.size())
{
return false;
}
this->emu_->write_register(gdb_registers[reg], data, size);
return true;
}
catch (...)
@@ -152,7 +142,25 @@ class x64_gdb_stub_handler : public gdb_stub::gdb_stub_handler
}
}
bool set_bp(const gdb_stub::breakpoint_type type, const size_t addr, const size_t size) override
bool read_memory(const uint64_t address, void* data, const size_t length) override
{
return this->emu_->try_read_memory(address, data, length);
}
bool write_memory(const uint64_t address, const void* data, const size_t length) override
{
try
{
this->emu_->write_memory(address, data, length);
return true;
}
catch (...)
{
return false;
}
}
bool set_breakpoint(const gdb_stub::breakpoint_type type, const uint64_t addr, const size_t size) override
{
try
{
@@ -172,7 +180,7 @@ class x64_gdb_stub_handler : public gdb_stub::gdb_stub_handler
}
}
bool del_bp(const gdb_stub::breakpoint_type type, const size_t addr, const size_t size) override
bool delete_breakpoint(const gdb_stub::breakpoint_type type, const uint64_t addr, const size_t size) override
{
try
{