status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #327 from realm/sk-fix-jsc-hack 

Fix ARM hook into JSGlobalContextCreateInGroup
This commit is contained in:
Scott Kyle 2016-03-16 09:13:56 -07:00
parent b053947353 850b03de56
commit cb3e168239
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ x.x.x Release notes (yyyy-MM-dd)
* Support relative paths when opening realms * Support relative paths when opening realms
### Bugfixes ### Bugfixes
* Fix for crash on Android when initializing the Realm module
* Automatically forward port 8082 for Android * Automatically forward port 8082 for Android
* Fix broken iterator methods on Android * Fix broken iterator methods on Android
* Don't download or unpack core libraries unnecessarily * Don't download or unpack core libraries unnecessarily

18
src/android/jsc_override.cpp
View File

@ -88,8 +88,8 @@ static void swap_function()
#if __arm__ #if __arm__
if (orig_thumb) { if (orig_thumb) {
// LDR PC, [PC, #0]; BX PC; // LDR R3, [PC, #0]; BX R3;
memcpy(orig_func, "\x00\x4f\x38\x47", 4); memcpy(orig_func, "\x00\x4b\x18\x47", 4);
memcpy(orig_func + 4, &new_func, 4); memcpy(orig_func + 4, &new_func, 4);
} else { } else {
// LDR PC, [PC, #0]; // LDR PC, [PC, #0];
@ -107,6 +107,20 @@ static void swap_function()
s_swapped = !s_swapped; s_swapped = !s_swapped;
#if __arm__
// Clear ARM instruction cache.
{
register unsigned long begin __asm("a1") = (unsigned long)orig_func;
register unsigned long end __asm("a2") = (unsigned long)code_end;
register unsigned long flag __asm("a3") = 0;
register unsigned long scno __asm("r7") = 0xf0002;
__asm __volatile (
"swi 0 @ sys_cacheflush"
: "=r" (begin)
: "0" (begin), "r" (end), "r" (flag), "r" (scno)
);
};
#endif
// Return this region to no longer being writable. // Return this region to no longer being writable.
mprotect((void*)page_start, code_end - page_start, PROT_READ | PROT_EXEC); mprotect((void*)page_start, code_end - page_start, PROT_READ | PROT_EXEC);
} }