ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rebase on latest master

This commit is contained in:
Luke Usher 2018-04-23 10:57:55 +01:00
parent c7d259ba92
commit 640d5570f1
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/win32/Cxbx.sln
View File

@ -127,6 +127,15 @@ Global
{7EE21ADA-3B02-4CD6-A891-C2257A54B061}.Release|Win32.ActiveCfg = Release|Win32
{7EE21ADA-3B02-4CD6-A891-C2257A54B061}.Release|Win32.Build.0 = Release|Win32
{7EE21ADA-3B02-4CD6-A891-C2257A54B061}.Release|x64.ActiveCfg = Release|Win32
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|Any CPU.ActiveCfg = Release|x64
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|Any CPU.Build.0 = Release|x64
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|Any CPU.Deploy.0 = Release|x64
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|Win32.ActiveCfg = Debug|Win32
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|Win32.Build.0 = Debug|Win32
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|Win32.Deploy.0 = Debug|Win32
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|x64.ActiveCfg = Debug|x64
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|x64.Build.0 = Debug|x64
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug_Direct3D9|x64.Deploy.0 = Debug|x64
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Any CPU.ActiveCfg = Debug|Win32
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.ActiveCfg = Debug|Win32
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.Build.0 = Debug|Win32
@ -137,6 +146,15 @@ Global
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Win32.Build.0 = Release|Win32
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.ActiveCfg = Release|x64
{17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.Build.0 = Release|x64
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|Any CPU.ActiveCfg = Release|x64
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|Any CPU.Build.0 = Release|x64
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|Any CPU.Deploy.0 = Release|x64
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|Win32.ActiveCfg = Debug|Win32
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|Win32.Build.0 = Debug|Win32
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|Win32.Deploy.0 = Debug|Win32
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|x64.ActiveCfg = Debug|x64
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|x64.Build.0 = Debug|x64
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug_Direct3D9|x64.Deploy.0 = Debug|x64
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Any CPU.ActiveCfg = Debug|Win32
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.ActiveCfg = Debug|Win32
{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.Build.0 = Debug|Win32

1
src/CxbxKrnl/EmuX86.cpp
View File

@ -313,6 +313,7 @@ uc_engine* EmuX86_Init()
// Set Unicorn to map 1:1 with our emulated Xbox memory (except HW registers)
// We should map this to 0x0 but unicorn doesn't like that (it can't take a nullptr as an argument)
// Mapping to the XBE base address is good enough
err = uc_mem_map_ptr(uc, XBE_IMAGE_BASE, 0xFD000000 - XBE_IMAGE_BASE, UC_PROT_ALL, (void*)XBE_IMAGE_BASE); // XBE Region (0x00000000)
if (err) {
CxbxKrnlCleanup("Failed on uc_mem_map_ptr(uc, 0, XBOX_MEMORY_SIZE, UC_PROT_ALL, 0) with error returned: %u\n", err);