Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

src/xenia/cpu/backend/null_backend.cc

@@ -0,0 +1,36 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2022 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/cpu/backend/null_backend.h"
+
+#include "xenia/cpu/backend/assembler.h"
+#include "xenia/cpu/function.h"
+
+namespace xe {
+namespace cpu {
+namespace backend {
+
+void NullBackend::CommitExecutableRange(uint32_t guest_low,
+                                        uint32_t guest_high) {}
+
+std::unique_ptr<Assembler> NullBackend::CreateAssembler() { return nullptr; }
+
+std::unique_ptr<GuestFunction> NullBackend::CreateGuestFunction(
+    Module* module, uint32_t address) {
+  return nullptr;
+}
+
+uint64_t NullBackend::CalculateNextHostInstruction(ThreadDebugInfo* thread_info,
+                                                   uint64_t current_pc) {
+  return current_pc;
+}
+
+}  // namespace backend
+}  // namespace cpu
+}  // namespace xe

src/xenia/cpu/backend/null_backend.h

@@ -0,0 +1,36 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2022 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_CPU_BACKEND_NULL_BACKEND_H_
+#define XENIA_CPU_BACKEND_NULL_BACKEND_H_
+
+#include "xenia/cpu/backend/backend.h"
+
+namespace xe {
+namespace cpu {
+namespace backend {
+
+class NullBackend : public Backend {
+ public:
+  void CommitExecutableRange(uint32_t guest_low, uint32_t guest_high) override;
+
+  std::unique_ptr<Assembler> CreateAssembler() override;
+
+  std::unique_ptr<GuestFunction> CreateGuestFunction(Module* module,
+                                                     uint32_t address) override;
+
+  uint64_t CalculateNextHostInstruction(ThreadDebugInfo* thread_info,
+                                        uint64_t current_pc) override;
+};
+
+}  // namespace backend
+}  // namespace cpu
+}  // namespace xe
+
+#endif  // XENIA_CPU_BACKEND_NULL_BACKEND_H_

src/xenia/cpu/backend/x64/x64_backend.cc

@@ -163,7 +163,7 @@ std::unique_ptr<GuestFunction> X64Backend::CreateGuestFunction(
   return std::make_unique<X64Function>(module, address);
 }
 
-uint64_t ReadCapstoneReg(X64Context* context, x86_reg reg) {
+uint64_t ReadCapstoneReg(HostThreadContext* context, x86_reg reg) {
   switch (reg) {
     case X86_REG_RAX:
       return context->rax;

src/xenia/cpu/backend/x64/x64_backend.h

@@ -27,8 +27,6 @@ namespace x64 {
 
 class X64CodeCache;
 
-#define XENIA_HAS_X64_BACKEND 1
-
 typedef void* (*HostToGuestThunk)(void* target, void* arg0, void* arg1);
 typedef void* (*GuestToHostThunk)(void* target, void* arg0, void* arg1);
 typedef void (*ResolveFunctionThunk)();