wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 468484 - Back out further arm-wince breakage from recent merging activity.

Browse Source
This commit is contained in:
Graydon Hoare 2008-12-11 17:09:45 -08:00
parent bb7e9793cf
commit 39ed76ba7c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/nanojit/Assembler.h
View File

@ -314,7 +314,7 @@ namespace nanojit
void asm_call(LInsp);
void asm_arg(ArgSize, LInsp, Register);
Register asm_binop_rhs_reg(LInsp ins);
NIns* asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool far);
NIns* asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool isfar);
void assignSavedRegs();
void reserveSavedRegs();
void assignParamRegs();

6
js/src/nanojit/NativeARM.cpp
View File

@ -1108,11 +1108,11 @@ Assembler::asm_prep_fcall(Reservation*, LInsp)
}
NIns*
Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool far)
Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool isfar)
{
// ignore far -- we figure this out on our own.
// ignore isfar -- we figure this out on our own.
// XXX noone actually uses the far param in nj anyway... (always false)
(void)far;
(void)isfar;
NIns* at = 0;
LOpcode condop = cond->opcode();

2
js/src/nanojit/NativeThumb.cpp
View File

@ -376,7 +376,7 @@ namespace nanojit
}
}
NIns* Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ)
NIns* Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool isfar)
{
NIns* at = 0;
LOpcode condop = cond->opcode();