Commit 0fad6259 authored by lrn@chromium.org's avatar lrn@chromium.org

Unsigned number can't be negated in the VisualStudio compiler.

Fixed a few earlier review comments that had slipped through.


git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1060 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent e78a32eb
...@@ -618,8 +618,9 @@ Handle<Object> RegExpMacroAssemblerIA32::GetCode(Handle<String> source) { ...@@ -618,8 +618,9 @@ Handle<Object> RegExpMacroAssemblerIA32::GetCode(Handle<String> source) {
__ sub(ecx, Operand::StaticVariable(stack_guard_limit)); __ sub(ecx, Operand::StaticVariable(stack_guard_limit));
// Handle it if the stack pointer is already below the stack limit. // Handle it if the stack pointer is already below the stack limit.
__ j(below_equal, &stack_limit_hit, not_taken); __ j(below_equal, &stack_limit_hit, not_taken);
// Check if there is room for num_registers + ebp above the stack limit. // Check if there is room for the variable number of registers above
__ cmp(ecx, (num_registers_ + 1) * kPointerSize); // the stack limit.
__ cmp(ecx, num_registers_ * kPointerSize);
__ j(above_equal, &stack_ok, taken); __ j(above_equal, &stack_ok, taken);
// Exit with exception. // Exit with exception.
__ mov(eax, EXCEPTION); __ mov(eax, EXCEPTION);
......
...@@ -178,7 +178,7 @@ class RegExpMacroAssemblerIA32: public RegExpMacroAssembler { ...@@ -178,7 +178,7 @@ class RegExpMacroAssemblerIA32: public RegExpMacroAssembler {
inline Register backtrack_stackpointer() { return ecx; } inline Register backtrack_stackpointer() { return ecx; }
// Byte size of chars in the string to match (decided by the Mode argument) // Byte size of chars in the string to match (decided by the Mode argument)
inline size_t char_size() { return static_cast<size_t>(mode_); } inline int char_size() { return static_cast<int>(mode_); }
// Equivalent to a conditional branch to the label, unless the label // Equivalent to a conditional branch to the label, unless the label
// is NULL, in which case it is a conditional Backtrack. // is NULL, in which case it is a conditional Backtrack.
...@@ -225,7 +225,7 @@ class RegExpMacroAssemblerIA32: public RegExpMacroAssembler { ...@@ -225,7 +225,7 @@ class RegExpMacroAssemblerIA32: public RegExpMacroAssembler {
// constants. // constants.
ByteArrayProvider constants_; ByteArrayProvider constants_;
// Which mode to generate code for (ASCII or UTF16). // Which mode to generate code for (ASCII or UC16).
Mode mode_; Mode mode_;
// One greater than maximal register index actually used. // One greater than maximal register index actually used.
......
...@@ -1055,8 +1055,6 @@ TEST(MacroAssemblerIA32AtStart) { ...@@ -1055,8 +1055,6 @@ TEST(MacroAssemblerIA32AtStart) {
} }
TEST(MacroAssemblerIA32BackRefNoCase) { TEST(MacroAssemblerIA32BackRefNoCase) {
v8::V8::Initialize(); v8::V8::Initialize();
ContextInitializer initializer; ContextInitializer initializer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment