Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1485701 - make the interceptor code compilable, if not functional, on aarch64 windows; r=aklotz

Browse Source
This commit is contained in:
Nathan Froyd 2018-08-28 09:27:57 -04:00
parent 7d55fef8da
commit 0b8d2e01f3
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozglue/misc/interceptor/PatcherDetour.h
View File

@ -52,6 +52,9 @@ public:
size_t nBytes = 1 + sizeof(intptr_t);
#elif defined(_M_X64)
size_t nBytes = 2 + sizeof(intptr_t);
#elif defined(_M_ARM64)
size_t nBytes = 4;
MOZ_RELEASE_ASSERT(false, "Shouldn't get here");
#else
#error "Unknown processor type"
#endif
@ -130,6 +133,8 @@ public:
if (!origBytes) {
continue;
}
#elif defined(_M_ARM64)
MOZ_RELEASE_ASSERT(false, "Shouldn't get here")
#else
#error "Unknown processor type"
#endif
@ -963,6 +968,8 @@ protected:
return;
}
}
#elif defined(_M_ARM64)
MOZ_RELEASE_ASSERT(false, "Shouldn't get here")
#else
#error "Unknown processor type"
#endif

4
mozglue/misc/interceptor/TargetFunction.h
View File

@ -361,7 +361,7 @@ private:
// needs to touch the heap.
#if defined(_M_IX86)
static const size_t kInlineStorage = 16;
#elif defined(_M_X64)
#elif defined(_M_X64) || defined(_M_ARM64)
static const size_t kInlineStorage = 32;
#endif
Vector<uint8_t, kInlineStorage> mLocalBytes;
@ -586,7 +586,7 @@ private:
// needs to touch the heap.
#if defined(_M_IX86)
static const size_t kInlineStorage = 16;
#elif defined(_M_X64)
#elif defined(_M_X64) || defined(_M_ARM64)
static const size_t kInlineStorage = 32;
#endif

5
mozglue/misc/nsWindowsDllInterceptor.h
View File

@ -432,6 +432,11 @@ private:
{
// Generally, code should not call this method directly. Use AddHook unless
// there is a specific need to avoid nop space patches.
#if defined(_M_ARM64)
// XXX: this is just to get things compiling; we'll have to add real
// support at some future point.
return false;
#endif
if (!mModule) {
return false;