Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Unified Diff: runtime/vm/flow_graph_compiler_mips.cc

Issue 785443002: Fix gc on MIPS (live registers were spilled in reversed order). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/flow_graph_compiler_ia32.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_mips.cc
===================================================================
--- runtime/vm/flow_graph_compiler_mips.cc (revision 42124)
+++ runtime/vm/flow_graph_compiler_mips.cc (working copy)
@@ -1490,19 +1490,21 @@
ASSERT(offset == (fpu_regs_count * kFpuRegisterSize));
}
- // Store general purpose registers with the lowest register number at the
- // lowest address.
+ // Store general purpose registers with the highest register number at the
+ // lowest address. The order in which the registers are pushed must match the
+ // order in which the registers are encoded in the safe point's stack map.
const intptr_t cpu_registers = locs->live_registers()->cpu_registers();
ASSERT((cpu_registers & ~kAllCpuRegistersList) == 0);
const int register_count = Utils::CountOneBits(cpu_registers);
- int registers_pushed = 0;
-
- __ addiu(SP, SP, Immediate(-register_count * kWordSize));
- for (int i = 0; i < kNumberOfCpuRegisters; i++) {
- Register r = static_cast<Register>(i);
- if (locs->live_registers()->ContainsRegister(r)) {
- __ sw(r, Address(SP, registers_pushed * kWordSize));
- registers_pushed++;
+ if (register_count > 0) {
+ __ addiu(SP, SP, Immediate(-register_count * kWordSize));
+ intptr_t offset = register_count * kWordSize;
+ for (int i = 0; i < kNumberOfCpuRegisters; i++) {
+ Register r = static_cast<Register>(i);
+ if (locs->live_registers()->ContainsRegister(r)) {
+ offset -= kWordSize;
+ __ sw(r, Address(SP, offset));
+ }
}
koda 2014/12/05 00:46:43 ASSERT(offset == 0)?
regis 2014/12/05 00:56:11 Done.
}
}
@@ -1509,22 +1511,23 @@
void FlowGraphCompiler::RestoreLiveRegisters(LocationSummary* locs) {
- // General purpose registers have the lowest register number at the
+ // General purpose registers have the highest register number at the
// lowest address.
__ TraceSimMsg("RestoreLiveRegisters");
const intptr_t cpu_registers = locs->live_registers()->cpu_registers();
ASSERT((cpu_registers & ~kAllCpuRegistersList) == 0);
const int register_count = Utils::CountOneBits(cpu_registers);
- int registers_popped = 0;
-
- for (int i = 0; i < kNumberOfCpuRegisters; i++) {
- Register r = static_cast<Register>(i);
- if (locs->live_registers()->ContainsRegister(r)) {
- __ lw(r, Address(SP, registers_popped * kWordSize));
- registers_popped++;
+ if (register_count > 0) {
+ intptr_t offset = register_count * kWordSize;
+ for (int i = 0; i < kNumberOfCpuRegisters; i++) {
+ Register r = static_cast<Register>(i);
+ if (locs->live_registers()->ContainsRegister(r)) {
+ offset -= kWordSize;
+ __ lw(r, Address(SP, offset));
+ }
}
+ __ addiu(SP, SP, Immediate(register_count * kWordSize));
koda 2014/12/05 00:46:43 ASSERT(offset == 0)?
regis 2014/12/05 00:56:11 Done.
}
- __ addiu(SP, SP, Immediate(register_count * kWordSize));
const intptr_t fpu_regs_count = locs->live_registers()->FpuRegisterCount();
if (fpu_regs_count > 0) {
« no previous file with comments | « runtime/vm/flow_graph_compiler_ia32.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698