On 6/16/26 08:34, Philippe Mathieu-Daudé wrote:
OpenRISC is only available with TCG. No need to keep
raise_exception() in a distinct file unit, merge it
with exception_helper.c.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
target/or1k/exception.h | 2 +-
target/or1k/exception.c | 30 ------------------------------
target/or1k/exception_helper.c | 13 +++++++++++--
target/or1k/meson.build | 1 -
4 files changed, 12 insertions(+), 34 deletions(-)
delete mode 100644 target/or1k/exception.c
diff --git a/target/or1k/exception.h b/target/or1k/exception.h
index f62fc314c1f..654ac9e515d 100644
--- a/target/or1k/exception.h
+++ b/target/or1k/exception.h
@@ -20,7 +20,7 @@
#ifndef TARGET_OPENRISC_EXCEPTION_H
#define TARGET_OPENRISC_EXCEPTION_H
-#include "cpu.h"
+#include "target/or1k/cpu-qom.h"
Why are you adding full paths here?
+++ b/target/or1k/exception_helper.c
@@ -18,9 +18,18 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "exec/helper-proto.h"
-#include "exception.h"
+
+#include "target/or1k/cpu.h"
+#include "target/or1k/exception.h"
And here there seems to be no need of adjusting the includes at all.
r~
