mirrors
/
OpenLoco
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make GOOD_PLACE_FOR_DATA_SEGMENT into a constexpr variable

This commit is contained in:
Justin Gottula 2018-01-24 15:38:21 -08:00
parent 4d726208ff
commit fd23ee08af
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/openloco/interop/interop.hpp
View File

@ -17,21 +17,8 @@ namespace std
}
#endif
#ifdef USE_MMAP
#if defined(PLATFORM_64BIT)
#define GOOD_PLACE_FOR_DATA_SEGMENT ((uintptr_t)0x200000000)
#elif defined(PLATFORM_32BIT)
#define GOOD_PLACE_FOR_DATA_SEGMENT ((uintptr_t)0x09000000)
#else
#error "Unknown platform"
#endif
#else
#define GOOD_PLACE_FOR_DATA_SEGMENT ((uintptr_t)0x8A4000)
#endif
namespace openloco::interop
{
#pragma pack(push, 1)
/**
* x86 register structure, only used for easy interop to Locomotion code.
@ -99,9 +86,21 @@ namespace openloco::interop
assert_struct_size(registers, 7 * 4);
#pragma pack(pop)
#ifndef USE_MMAP
constexpr uintptr_t GOOD_PLACE_FOR_DATA_SEGMENT = 0x008A4000;
#else
#if defined(PLATFORM_32BIT)
constexpr uintptr_t GOOD_PLACE_FOR_DATA_SEGMENT = 0x09000000;
#elif defined(PLATFORM_64BIT)
constexpr uintptr_t GOOD_PLACE_FOR_DATA_SEGMENT = 0x200000000;
#else
#error "Unknown platform"
#endif
#endif
constexpr uintptr_t remap_address(uintptr_t locoAddress)
{
return GOOD_PLACE_FOR_DATA_SEGMENT - 0x8A4000 + locoAddress;
return GOOD_PLACE_FOR_DATA_SEGMENT - 0x008A4000 + locoAddress;
}
template<uint32_t TAddress, typename T>