Update kernel convention for xboxkrnl_ob.cc

xenia-project · Dec 20, 2016 · 345b070 · 345b070
1 parent 7f453a2
commit 345b070
Showing 1 changed file with 24 additions and 42 deletions.
diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc
@@ -20,35 +20,31 @@ namespace xe {
 namespace kernel {
 namespace xboxkrnl {
 
-SHIM_CALL ObOpenObjectByName_shim(PPCContext* ppc_context,
-                                  KernelState* kernel_state) {
+dword_result_t ObOpenObjectByName(lpunknown_t obj_attributes_ptr,
+                                  lpunknown_t object_type_ptr, dword_t unk,
+                                  lpdword_t handle_ptr) {
   // r3 = ptr to info?
   //   +0 = -4
   //   +4 = name ptr
   //   +8 = 0
   // r4 = ExEventObjectType | ExSemaphoreObjectType | ExTimerObjectType
   // r5 = 0
   // r6 = out_ptr (handle?)
-  uint32_t obj_attributes_ptr = SHIM_GET_ARG_32(0);
-  uint32_t object_type_ptr = SHIM_GET_ARG_32(1);
-  uint32_t unk = SHIM_GET_ARG_32(2);
-  uint32_t handle_ptr = SHIM_GET_ARG_32(3);
 
   auto name =
-      X_ANSI_STRING::to_string_indirect(SHIM_MEM_BASE, obj_attributes_ptr + 4);
-
-  XELOGD("ObOpenObjectByName(%.8X(name=%s), %.8X, %.8X, %.8X)",
-         obj_attributes_ptr, name.c_str(), object_type_ptr, unk, handle_ptr);
+      X_ANSI_STRING::to_string_indirect(kernel_memory()->virtual_membase(),
+                                        obj_attributes_ptr.guest_address() + 4);
 
   X_HANDLE handle = X_INVALID_HANDLE_VALUE;
   X_STATUS result =
-      kernel_state->object_table()->GetObjectByName(name, &handle);
+      kernel_state()->object_table()->GetObjectByName(name, &handle);
   if (XSUCCEEDED(result)) {
-    SHIM_SET_MEM_32(handle_ptr, handle);
+    *handle_ptr = handle;
   }
 
-  SHIM_SET_RETURN_32(result);
+  return result;
 }
+DECLARE_XBOXKRNL_EXPORT(ObOpenObjectByName, ExportTag::kImplemented);
 
 dword_result_t ObOpenObjectByPointer(lpvoid_t object_ptr,
                                      lpdword_t out_handle_ptr) {
@@ -78,18 +74,12 @@ dword_result_t ObLookupThreadByThreadId(dword_t thread_id,
 }
 DECLARE_XBOXKRNL_EXPORT(ObLookupThreadByThreadId, ExportTag::kImplemented);
 
-SHIM_CALL ObReferenceObjectByHandle_shim(PPCContext* ppc_context,
-                                         KernelState* kernel_state) {
-  uint32_t handle = SHIM_GET_ARG_32(0);
-  uint32_t object_type_ptr = SHIM_GET_ARG_32(1);
-  uint32_t out_object_ptr = SHIM_GET_ARG_32(2);
-
-  XELOGD("ObReferenceObjectByHandle(%.8X, %.8X, %.8X)", handle, object_type_ptr,
-         out_object_ptr);
-
+dword_result_t ObReferenceObjectByHandle(dword_t handle,
+                                         dword_t object_type_ptr,
+                                         lpdword_t out_object_ptr) {
   X_STATUS result = X_STATUS_SUCCESS;
 
-  auto object = kernel_state->object_table()->LookupObject<XObject>(handle);
+  auto object = kernel_state()->object_table()->LookupObject<XObject>(handle);
   if (object) {
     // TODO(benvanik): verify type with object_type_ptr
 
@@ -138,36 +128,32 @@ SHIM_CALL ObReferenceObjectByHandle_shim(PPCContext* ppc_context,
     // Caller takes the reference.
     // It's released in ObDereferenceObject.
     object->Retain();
-    if (out_object_ptr) {
-      SHIM_SET_MEM_32(out_object_ptr, native_ptr);
+    if (out_object_ptr.guest_address()) {
+      *out_object_ptr = native_ptr;
     }
   } else {
     result = X_STATUS_INVALID_HANDLE;
   }
 
-  SHIM_SET_RETURN_32(result);
+  return result;
 }
+DECLARE_XBOXKRNL_EXPORT(ObReferenceObjectByHandle, ExportTag::kImplemented);
 
-SHIM_CALL ObDereferenceObject_shim(PPCContext* ppc_context,
-                                   KernelState* kernel_state) {
-  uint32_t native_ptr = SHIM_GET_ARG_32(0);
-
-  XELOGD("ObDereferenceObject(%.8X)", native_ptr);
-
+dword_result_t ObDereferenceObject(dword_t native_ptr) {
   // Check if a dummy value from ObReferenceObjectByHandle.
   if (native_ptr == 0xDEADF00D) {
-    SHIM_SET_RETURN_32(0);
-    return;
+    return 0;
   }
 
-  void* object_ptr = SHIM_MEM_ADDR(native_ptr);
-  auto object = XObject::GetNativeObject<XObject>(kernel_state, object_ptr);
+  auto object = XObject::GetNativeObject<XObject>(
+      kernel_state(), kernel_memory()->virtual_membase() + native_ptr);
   if (object) {
     object->Release();
   }
 
-  SHIM_SET_RETURN_32(0);
+  return 0;
 }
+DECLARE_XBOXKRNL_EXPORT(ObDereferenceObject, ExportTag::kImplemented);
 
 dword_result_t ObCreateSymbolicLink(pointer_t<X_ANSI_STRING> path,
                                     pointer_t<X_ANSI_STRING> target) {
@@ -231,11 +217,7 @@ dword_result_t NtClose(dword_t handle) {
 DECLARE_XBOXKRNL_EXPORT(NtClose, ExportTag::kImplemented);
 
 void RegisterObExports(xe::cpu::ExportResolver* export_resolver,
-                       KernelState* kernel_state) {
-  SHIM_SET_MAPPING("xboxkrnl.exe", ObOpenObjectByName, state);
-  SHIM_SET_MAPPING("xboxkrnl.exe", ObReferenceObjectByHandle, state);
-  SHIM_SET_MAPPING("xboxkrnl.exe", ObDereferenceObject, state);
-}
+                       KernelState* kernel_state) {}
 
 }  // namespace xboxkrnl
 }  // namespace kernel