Revision: 24408
Author: [email protected]
Date: Mon Oct 6 10:46:15 2014 UTC
Log: Make V8 compile with Win64 dbg
BUG=chromium:420538
[email protected]
LOG=n
Review URL: https://codereview.chromium.org/634493002
https://code.google.com/p/v8/source/detail?r=24408
Modified:
/branches/bleeding_edge/src/allocation.cc
/branches/bleeding_edge/src/compiler/instruction-selector.cc
/branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc
/branches/bleeding_edge/src/compiler/x64/instruction-selector-x64.cc
=======================================
--- /branches/bleeding_edge/src/allocation.cc Tue Sep 2 13:36:35 2014 UTC
+++ /branches/bleeding_edge/src/allocation.cc Mon Oct 6 10:46:15 2014 UTC
@@ -85,7 +85,7 @@
void* AlignedAlloc(size_t size, size_t alignment) {
DCHECK_LE(V8_ALIGNOF(void*), alignment);
- DCHECK(base::bits::IsPowerOfTwo32(alignment));
+ DCHECK(base::bits::IsPowerOfTwo64(alignment));
void* ptr;
#if V8_OS_WIN
ptr = _aligned_malloc(size, alignment);
=======================================
--- /branches/bleeding_edge/src/compiler/instruction-selector.cc Wed Oct 1
14:03:02 2014 UTC
+++ /branches/bleeding_edge/src/compiler/instruction-selector.cc Mon Oct 6
10:46:15 2014 UTC
@@ -32,8 +32,8 @@
for (BasicBlockVectorIter i = blocks->begin(); i != blocks->end(); ++i) {
BasicBlock* block = *i;
if (!block->IsLoopHeader()) continue;
- DCHECK_NE(0, block->PredecessorCount());
- DCHECK_NE(1, block->PredecessorCount());
+ DCHECK_NE(0, static_cast<int>(block->PredecessorCount()));
+ DCHECK_NE(1, static_cast<int>(block->PredecessorCount()));
for (BasicBlock::const_iterator j = block->begin(); j != block->end();
++j) {
Node* phi = *j;
@@ -253,9 +253,11 @@
bool call_code_immediate,
bool
call_address_immediate) {
OperandGenerator g(this);
- DCHECK_EQ(call->op()->OutputCount(), buffer->descriptor->ReturnCount());
- DCHECK_EQ(OperatorProperties::GetValueInputCount(call->op()),
- buffer->input_count() + buffer->frame_state_count());
+ DCHECK_EQ(call->op()->OutputCount(),
+ static_cast<int>(buffer->descriptor->ReturnCount()));
+ DCHECK_EQ(
+ OperatorProperties::GetValueInputCount(call->op()),
+ static_cast<int>(buffer->input_count() +
buffer->frame_state_count()));
if (buffer->descriptor->ReturnCount() > 0) {
// Collect the projections that represent multiple outputs from this
call.
@@ -303,7 +305,7 @@
buffer->descriptor->GetInputType(0)));
break;
}
- DCHECK_EQ(1, buffer->instruction_args.size());
+ DCHECK_EQ(1, static_cast<int>(buffer->instruction_args.size()));
// If the call needs a frame state, we insert the state information as
// follows (n is the number of value inputs to the frame state):
@@ -1059,9 +1061,10 @@
DCHECK_EQ(IrOpcode::kStateValues, locals->op()->opcode());
DCHECK_EQ(IrOpcode::kStateValues, stack->op()->opcode());
- DCHECK_EQ(descriptor->parameters_count(), parameters->InputCount());
- DCHECK_EQ(descriptor->locals_count(), locals->InputCount());
- DCHECK_EQ(descriptor->stack_count(), stack->InputCount());
+ DCHECK_EQ(static_cast<int>(descriptor->parameters_count()),
+ parameters->InputCount());
+ DCHECK_EQ(static_cast<int>(descriptor->locals_count()),
locals->InputCount());
+ DCHECK_EQ(static_cast<int>(descriptor->stack_count()),
stack->InputCount());
OperandGenerator g(this);
for (int i = 0; i < static_cast<int>(descriptor->parameters_count());
i++) {
=======================================
--- /branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc Thu Oct
2 09:08:09 2014 UTC
+++ /branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc Mon Oct
6 10:46:15 2014 UTC
@@ -651,7 +651,7 @@
// Materialize a full 64-bit 1 or 0 value. The result register is always
the
// last output of the instruction.
Label check;
- DCHECK_NE(0, instr->OutputCount());
+ DCHECK_NE(0, static_cast<int>(instr->OutputCount()));
Register reg = i.OutputRegister(static_cast<int>(instr->OutputCount() -
1));
Condition cc = no_condition;
switch (condition) {
=======================================
--- /branches/bleeding_edge/src/compiler/x64/instruction-selector-x64.cc
Thu Oct 2 09:08:09 2014 UTC
+++ /branches/bleeding_edge/src/compiler/x64/instruction-selector-x64.cc
Mon Oct 6 10:46:15 2014 UTC
@@ -105,10 +105,10 @@
}
if (displacement_operand_ != NULL) {
// Pure displacement mode not supported by x64.
- DCHECK_NE(input_count, 0);
+ DCHECK_NE(static_cast<int>(input_count), 0);
inputs[input_count++] = displacement_operand_;
}
- DCHECK_NE(input_count, 0);
+ DCHECK_NE(static_cast<int>(input_count), 0);
return input_count;
}
@@ -262,8 +262,8 @@
outputs[output_count++] = g.DefineAsRegister(cont->result());
}
- DCHECK_NE(0, input_count);
- DCHECK_NE(0, output_count);
+ DCHECK_NE(0, static_cast<int>(input_count));
+ DCHECK_NE(0, static_cast<int>(output_count));
DCHECK_GE(arraysize(inputs), input_count);
DCHECK_GE(arraysize(outputs), output_count);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
