Author: [email protected]
Date: Fri May 15 16:13:59 2009
New Revision: 1980
Modified:
trunk/src/ia32/codegen-ia32.cc
trunk/src/version.cc
Log:
- Push change 1978 to trunk.
Review URL: http://codereview.chromium.org/112031
Modified: trunk/src/ia32/codegen-ia32.cc
==============================================================================
--- trunk/src/ia32/codegen-ia32.cc (original)
+++ trunk/src/ia32/codegen-ia32.cc Fri May 15 16:13:59 2009
@@ -113,7 +113,16 @@
// Adjust for function-level loop nesting.
loop_nesting_ += fun->loop_nesting();
- {
+#ifdef DEBUG
+ if (strlen(FLAG_stop_at) > 0 &&
+ fun->name()->IsEqualTo(CStrVector(FLAG_stop_at))) {
+ frame_->SpillAll();
+ __ int3();
+ }
+#endif
+
+ // New scope to get automatic timing calculation.
+ { // NOLINT
CodeGenState state(this);
// Entry:
@@ -125,14 +134,6 @@
allocator_->Initialize();
frame_->Enter();
-#ifdef DEBUG
- if (strlen(FLAG_stop_at) > 0 &&
- fun->name()->IsEqualTo(CStrVector(FLAG_stop_at))) {
- frame_->SpillAll();
- __ int3();
- }
-#endif
-
// Allocate space for locals and initialize them.
frame_->AllocateStackSlots(scope_->num_stack_slots());
// Initialize the function return target after the locals are set
@@ -4876,9 +4877,9 @@
// successfully allocate a temporary byte register.
if (tmp.is_valid()) {
__ setcc(overflow, tmp.reg());
- __ or_(Operand(value.reg()), tmp.reg());
+ __ or_(Operand(tmp.reg()), value.reg());
+ __ test(tmp.reg(), Immediate(kSmiTagMask));
tmp.Unuse();
- __ test(value.reg(), Immediate(kSmiTagMask));
deferred->enter()->Branch(not_zero, &value, not_taken);
} else { // Otherwise we test separately for overflow and smi check.
deferred->enter()->Branch(overflow, &value, not_taken);
Modified: trunk/src/version.cc
==============================================================================
--- trunk/src/version.cc (original)
+++ trunk/src/version.cc Fri May 15 16:13:59 2009
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 1
#define MINOR_VERSION 2
#define BUILD_NUMBER 3
-#define PATCH_LEVEL 2
+#define PATCH_LEVEL 3
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
