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

Side by Side Diff: src/x64/full-codegen-x64.cc

Issue 6579036: Fix porting bug in r6929 (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 10 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 context = temp; 1088 context = temp;
1089 } 1089 }
1090 } 1090 }
1091 // Check that last extension is NULL. 1091 // Check that last extension is NULL.
1092 __ cmpq(ContextOperand(context, Context::EXTENSION_INDEX), Immediate(0)); 1092 __ cmpq(ContextOperand(context, Context::EXTENSION_INDEX), Immediate(0));
1093 __ j(not_equal, slow); 1093 __ j(not_equal, slow);
1094 1094
1095 // This function is used only for loads, not stores, so it's safe to 1095 // This function is used only for loads, not stores, so it's safe to
1096 // return an rsi-based operand (the write barrier cannot be allowed to 1096 // return an rsi-based operand (the write barrier cannot be allowed to
1097 // destroy the rsi register). 1097 // destroy the rsi register).
1098 return ContextOperand(temp, slot->index()); 1098 return ContextOperand(context, slot->index());
1099 } 1099 }
1100 1100
1101 1101
1102 void FullCodeGenerator::EmitDynamicLoadFromSlotFastCase( 1102 void FullCodeGenerator::EmitDynamicLoadFromSlotFastCase(
1103 Slot* slot, 1103 Slot* slot,
1104 TypeofState typeof_state, 1104 TypeofState typeof_state,
1105 Label* slow, 1105 Label* slow,
1106 Label* done) { 1106 Label* done) {
1107 // Generate fast-case code for variables that might be shadowed by 1107 // Generate fast-case code for variables that might be shadowed by
1108 // eval-introduced variables. Eval is used a lot without 1108 // eval-introduced variables. Eval is used a lot without
(...skipping 2689 matching lines...) Expand 10 before | Expand all | Expand 10 after
3798 __ ret(0); 3798 __ ret(0);
3799 } 3799 }
3800 3800
3801 3801
3802 #undef __ 3802 #undef __
3803 3803
3804 3804
3805 } } // namespace v8::internal 3805 } } // namespace v8::internal
3806 3806
3807 #endif // V8_TARGET_ARCH_X64 3807 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698