AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

MIPS: Minor bug fixes to macro-asm and simulator.

Browse Source 
3 small fixes:
  - Fix erroneous use of reg t6 in macro-assembler.
  - Minor optimization to overflow-check macros.
  - Fix un-init var use (typo) in simulator FPCall handling.

None of these affected test cases.

BUG=
TEST=

Review URL: http://codereview.chromium.org//7236025
Patch from Paul Lind <plind44@gmail.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8418 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
sgjesse@chromium.org 2011-06-24 13:23:18 +00:00
parent 9310a8d78f
commit b55a673177
2 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/mips/macro-assembler-mips.cc
View File

@ -837,11 +837,11 @@ void MacroAssembler::Trunc_uw_d(FPURegister fd, FPURegister fs) {
void MacroAssembler::Trunc_uw_d(FPURegister fd, Register rs) {
ASSERT(!fd.is(f22));
ASSERT(!rs.is(t6));
ASSERT(!rs.is(t8));
// Load 2^31 into f22.
Or(t6, zero_reg, 0x80000000);
Cvt_d_uw(f22, t6);
Or(t8, zero_reg, 0x80000000);
Cvt_d_uw(f22, t8);
// Test if f22 > fd.
c(OLT, D, fd, f22);
@ -856,7 +856,7 @@ void MacroAssembler::Trunc_uw_d(FPURegister fd, Register rs) {
sub_d(f22, fd, f22);
trunc_w_d(f22, f22);
mfc1(rs, f22);
or_(rs, rs, t6);
or_(rs, rs, t8);
Label done;
Branch(&done);
@ -2563,8 +2563,8 @@ void MacroAssembler::AllocateHeapNumberWithValue(Register result,
Register scratch1,
Register scratch2,
Label* gc_required) {
LoadRoot(t6, Heap::kHeapNumberMapRootIndex);
AllocateHeapNumber(result, scratch1, scratch2, t6, gc_required);
LoadRoot(t8, Heap::kHeapNumberMapRootIndex);
AllocateHeapNumber(result, scratch1, scratch2, t8, gc_required);
sdc1(value, FieldMemOperand(result, HeapNumber::kValueOffset));
}
@ -3248,23 +3248,18 @@ void MacroAssembler::AdduAndCheckForOverflow(Register dst,
ASSERT(!overflow_dst.is(right));
ASSERT(!left.is(right));
// TODO(kalmard) There must be a way to optimize dst == left and dst == right
// cases.
if (dst.is(left)) {
addu(overflow_dst, left, right);
xor_(dst, overflow_dst, left);
xor_(scratch, overflow_dst, right);
and_(scratch, scratch, dst);
mov(dst, overflow_dst);
mov(overflow_dst, scratch);
mov(scratch, left); // Preserve left.
addu(dst, left, right); // Left is overwritten.
xor_(scratch, dst, scratch); // Original left.
xor_(overflow_dst, dst, right);
and_(overflow_dst, overflow_dst, scratch);
} else if (dst.is(right)) {
addu(overflow_dst, left, right);
xor_(dst, overflow_dst, right);
xor_(scratch, overflow_dst, left);
and_(scratch, scratch, dst);
mov(dst, overflow_dst);
mov(overflow_dst, scratch);
mov(scratch, right); // Preserve right.
addu(dst, left, right); // Right is overwritten.
xor_(scratch, dst, scratch); // Original right.
xor_(overflow_dst, dst, left);
and_(overflow_dst, overflow_dst, scratch);
} else {
addu(dst, left, right);
xor_(overflow_dst, dst, left);
@ -3288,23 +3283,18 @@ void MacroAssembler::SubuAndCheckForOverflow(Register dst,
ASSERT(!scratch.is(left));
ASSERT(!scratch.is(right));
// TODO(kalmard) There must be a way to optimize dst == left and dst == right
// cases.
if (dst.is(left)) {
subu(overflow_dst, left, right);
xor_(scratch, overflow_dst, left);
xor_(dst, left, right);
and_(scratch, scratch, dst);
mov(dst, overflow_dst);
mov(overflow_dst, scratch);
mov(scratch, left); // Preserve left.
subu(dst, left, right); // Left is overwritten.
xor_(overflow_dst, dst, scratch); // scratch is original left.
xor_(scratch, scratch, right); // scratch is original left.
and_(overflow_dst, scratch, overflow_dst);
} else if (dst.is(right)) {
subu(overflow_dst, left, right);
xor_(dst, left, right);
xor_(scratch, overflow_dst, left);
and_(scratch, scratch, dst);
mov(dst, overflow_dst);
mov(overflow_dst, scratch);
mov(scratch, right); // Preserve right.
subu(dst, left, right); // Right is overwritten.
xor_(overflow_dst, dst, left);
xor_(scratch, left, scratch); // Original right.
and_(overflow_dst, scratch, overflow_dst);
} else {
subu(dst, left, right);
xor_(overflow_dst, dst, left);

2
src/mips/simulator-mips.cc
View File

@ -1484,7 +1484,7 @@ void Simulator::SoftwareInterrupt(Instruction* instr) {
case ExternalReference::BUILTIN_FP_CALL:
GetFpArgs(&dval0);
PrintF("Call to host function at %p with arg %f",
FUNCTION_ADDR(target), dval1);
FUNCTION_ADDR(target), dval0);
break;
case ExternalReference::BUILTIN_FP_INT_CALL:
GetFpArgs(&dval0, &ival);