christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge branch 'qemu-fixes'

Browse Source 
Change-Id: I2154750088405bd552020e6ebe6982ee05df3b16
This commit is contained in:
Horst Schirmeier
2020-06-08 09:58:26 +02:00
parent e17dfe9c3a f9ed535c4a
commit cd31e27e97
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/sal/ConcreteCPU.hpp
View File

@ -10,7 +10,11 @@
#error Active config currently not supported! #error Active config currently not supported!
#endif #endif
#elif defined BUILD_QEMU #elif defined BUILD_QEMU
#include "qemu/QEMUConfig.hpp" #if defined BUILD_X86
#include "qemu/QEMUx86CPU.hpp"
#else
#error Active config currently not supported!
#endif
#elif defined BUILD_T32 #elif defined BUILD_T32
#include "t32/T32Config.hpp" #include "t32/T32Config.hpp"
#if defined BUILD_ARM #if defined BUILD_ARM

4
src/core/sal/qemu/QEMUController.hpp
View File

@ -22,7 +22,7 @@ class TimerListener;
*/ */
class QEMUController : public SimulatorController { class QEMUController : public SimulatorController {
public: public:
CPUX86State *m_cpuenv; CPUX86State *m_cpu0env;
// Initialize the controller. // Initialize the controller.
QEMUController(); QEMUController();
@ -60,7 +60,7 @@ public:
*/ */
void reboot() {} void reboot() {}
/* internal, QEMU-specific stuff */ /* internal, QEMU-specific stuff */
void setCPUEnv(struct CPUX86State *env) { m_cpuenv = env; } void setCPUEnv(struct CPUX86State *env) { m_cpu0env = env; }
}; };
} // end-of-namespace: fail } // end-of-namespace: fail

4
src/core/sal/qemu/QEMUListener.ah
View File

@ -41,7 +41,7 @@ aspect QEMUListener
bool onAddition() bool onAddition()
{ {
//std::cout << "QEMUMemWriteListener::onAddition" << std::endl; //std::cout << "QEMUMemWriteListener::onAddition" << std::endl;
if (failqemu_add_watchpoint(simulator.m_cpuenv, m_WatchAddr, m_WatchWidth, 1) != 0) { if (failqemu_add_watchpoint(simulator.m_cpu0env, m_WatchAddr, m_WatchWidth, 1) != 0) {
std::cout << "adding watchpoint failed!" << std::endl; std::cout << "adding watchpoint failed!" << std::endl;
return false; return false;
} }
@ -51,7 +51,7 @@ aspect QEMUListener
void onDeletion() void onDeletion()
{ {
//std::cout << "QEMUMemWriteListener::onDeletion" << std::endl; //std::cout << "QEMUMemWriteListener::onDeletion" << std::endl;
failqemu_remove_watchpoint(simulator.m_cpuenv, m_WatchAddr, m_WatchWidth, 1); failqemu_remove_watchpoint(simulator.m_cpu0env, m_WatchAddr, m_WatchWidth, 1);
} }
}; };
}; };

1
src/core/sal/qemu/lol.h
View File

@ -1 +0,0 @@
#error YO DAWG