Merge branch 'master' into linux_windowing

src/xenia/cpu/ppc/ppc_emit_control.cc

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Copyright 2021 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -426,6 +426,10 @@ int InstrEmit_sc(PPCHIRBuilder& f, const InstrData& i) {
   // Game code should only ever use LEV=0.
   // LEV=2 is to signify 'call import' from Xenia.
   // TODO(gibbed): syscalls!
+  if (i.SC.LEV == 0) {
+    f.CallExtern(f.builtins()->syscall_handler);
+    return 0;
+  }
   if (i.SC.LEV == 2) {
     f.CallExtern(f.function());
     return 0;
@@ -807,5 +811,5 @@ void RegisterEmitCategoryControl() {
 }
 
 }  // namespace cpu
-}  // namespace xe
+}  // namespace cpu
 }  // namespace xe

src/xenia/cpu/ppc/ppc_frontend.cc

@@ -10,6 +10,7 @@
 #include "xenia/cpu/ppc/ppc_frontend.h"
 
 #include "xenia/base/atomic.h"
+#include "xenia/base/logging.h"
 #include "xenia/cpu/ppc/ppc_context.h"
 #include "xenia/cpu/ppc/ppc_emit.h"
 #include "xenia/cpu/ppc/ppc_opcode_info.h"
@@ -78,6 +79,17 @@ void LeaveGlobalLock(PPCContext* ppc_context, void* arg0, void* arg1) {
   global_mutex->unlock();
 }
 
+void SyscallHandler(PPCContext* ppc_context, void* arg0, void* arg1) {
+  uint64_t syscall_number = ppc_context->r[0];
+  switch (syscall_number) {
+    default:
+      assert_unhandled_case(syscall_number);
+      XELOGE("Unhandled syscall {}!", syscall_number);
+      break;
+#pragma warning(suppress : 4065)
+  }
+}
+
 bool PPCFrontend::Initialize() {
   void* arg0 = reinterpret_cast<void*>(&xe::global_critical_region::mutex());
   void* arg1 = reinterpret_cast<void*>(&builtins_.global_lock_count);
@@ -87,6 +99,8 @@ bool PPCFrontend::Initialize() {
       processor_->DefineBuiltin("EnterGlobalLock", EnterGlobalLock, arg0, arg1);
   builtins_.leave_global_lock =
       processor_->DefineBuiltin("LeaveGlobalLock", LeaveGlobalLock, arg0, arg1);
+  builtins_.syscall_handler = processor_->DefineBuiltin(
+      "SyscallHandler", SyscallHandler, nullptr, nullptr);
   return true;
 }
 

src/xenia/cpu/ppc/ppc_frontend.h

@@ -33,6 +33,7 @@ struct PPCBuiltins {
   Function* check_global_lock;
   Function* enter_global_lock;
   Function* leave_global_lock;
+  Function* syscall_handler;
 };
 
 class PPCFrontend {

src/xenia/cpu/ppc/ppc_hir_builder.cc

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2020 Ben Vanik. All rights reserved.                             *
+ * Copyright 2021 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -104,8 +104,8 @@ bool PPCHIRBuilder::Emit(GuestFunction* function, uint32_t flags) {
   // instruction may have a label assigned to it if it hasn't been hit
   // yet.
   size_t list_size = instr_count_ * sizeof(void*);
-  instr_offset_list_ = (Instr**)arena_->Alloc(list_size);
-  label_list_ = (Label**)arena_->Alloc(list_size);
+  instr_offset_list_ = (Instr**)arena_->Alloc(list_size, alignof(void*));
+  label_list_ = (Label**)arena_->Alloc(list_size, alignof(void*));
   std::memset(instr_offset_list_, 0, list_size);
   std::memset(label_list_, 0, list_size);
 
@@ -244,7 +244,7 @@ void PPCHIRBuilder::AnnotateLabel(uint32_t address, Label* label) {
   char name_buffer[13];
   auto format_result = fmt::format_to_n(name_buffer, 12, "loc_{:08X}", address);
   name_buffer[format_result.size] = '\0';
-  label->name = (char*)arena_->Alloc(sizeof(name_buffer));
+  label->name = (char*)arena_->Alloc(sizeof(name_buffer), 1);
   memcpy(label->name, name_buffer, sizeof(name_buffer));
 }