wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-07 16:28:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into custom

Browse source
This commit is contained in:
Roy Tam 2019-10-18 09:06:42 +08:00
commit 4ea7de218b
6 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/src/jit/arm/MacroAssembler-arm.cpp
View file

@ -3462,8 +3462,8 @@ MacroAssemblerARMCompat::storePayload(const Value& val, const Address& dest)
ScratchRegisterScope scratch(asMasm());
SecondScratchRegisterScope scratch2(asMasm());
if (val.isMarkable())
ma_mov(ImmGCPtr(val.toMarkablePointer()), scratch);
if (val.isGCThing())
ma_mov(ImmGCPtr(val.toGCThing()), scratch);
else
ma_mov(Imm32(val.toNunboxPayload()), scratch);
ma_str(scratch, ToPayload(dest), scratch2);

6
js/src/jsnativestack.cpp
View file

@ -26,11 +26,7 @@
# include <sys/syscall.h>
# include <sys/types.h>
# include <unistd.h>
static pid_t
gettid()
{
return syscall(__NR_gettid);
}
# define gettid() static_cast<pid_t>(syscall(SYS_gettid))
# endif
#else