AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

refactor BlockVisitor in asm to wasm and fix tests

Browse Source 
TEST=asm-wasm.js
R=titzer@chromium.org,bradnelson@google.com
BUG=

Review URL: https://codereview.chromium.org/1584573002

Cr-Commit-Position: refs/heads/master@{#33253}
This commit is contained in:
aseemgarg 2016-01-12 13:59:10 -08:00 committed by Commit bot
parent 8cf798736f
commit cd646f88a1
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wasm/asm-wasm-builder.cc
View File

@ -92,8 +92,8 @@ class AsmWasmBuilderImpl : public AstVisitor {
}
}
DCHECK(in_function_);
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprBlock, false);
block_size_ = static_cast<byte>(stmt->statements()->length());
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprBlock, false,
static_cast<byte>(stmt->statements()->length()));
RECURSE(VisitStatements(stmt->statements()));
DCHECK(block_size_ >= 0);
}
@ -106,12 +106,13 @@ class AsmWasmBuilderImpl : public AstVisitor {
public:
BlockVisitor(AsmWasmBuilderImpl* builder, BreakableStatement* stmt,
WasmOpcode opcode, bool is_loop)
WasmOpcode opcode, bool is_loop, int initial_block_size)
: builder_(builder) {
builder_->breakable_blocks_.push_back(std::make_pair(stmt, is_loop));
builder_->current_function_builder_->Emit(opcode);
index_ = builder_->current_function_builder_->EmitEditableImmediate(0);
prev_block_size_ = builder_->block_size_;
builder_->block_size_ = initial_block_size;
}
~BlockVisitor() {
builder_->current_function_builder_->EditImmediate(index_,
@ -225,8 +226,7 @@ class AsmWasmBuilderImpl : public AstVisitor {
VisitLiteral(label);
current_function_builder_->Emit(kExprGetLocal);
AddLeb128(fall_through, true);
BlockVisitor visitor(this, nullptr, kExprBlock, false);
block_size_ = 0;
BlockVisitor visitor(this, nullptr, kExprBlock, false, 0);
SetLocalTo(fall_through, 1);
ZoneList<Statement*>* stmts = clause->statements();
block_size_ += stmts->length();
@ -236,8 +236,8 @@ class AsmWasmBuilderImpl : public AstVisitor {
void VisitSwitchStatement(SwitchStatement* stmt) {
VariableProxy* tag = stmt->tag()->AsVariableProxy();
DCHECK(tag != NULL);
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprBlock, false);
block_size_ = 0;
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprBlock, false,
0);
uint16_t fall_through = current_function_builder_->AddLocal(kAstI32);
SetLocalTo(fall_through, 0);
@ -258,8 +258,8 @@ class AsmWasmBuilderImpl : public AstVisitor {
void VisitDoWhileStatement(DoWhileStatement* stmt) {
DCHECK(in_function_);
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprLoop, true);
block_size_ = 2;
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprLoop, true,
2);
RECURSE(Visit(stmt->body()));
current_function_builder_->Emit(kExprIf);
RECURSE(Visit(stmt->cond()));
@ -269,8 +269,8 @@ class AsmWasmBuilderImpl : public AstVisitor {
void VisitWhileStatement(WhileStatement* stmt) {
DCHECK(in_function_);
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprLoop, true);
block_size_ = 1;
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprLoop, true,
1);
current_function_builder_->Emit(kExprIf);
RECURSE(Visit(stmt->cond()));
current_function_builder_->EmitWithU8(kExprBr, 0);
@ -283,8 +283,8 @@ class AsmWasmBuilderImpl : public AstVisitor {
block_size_++;
RECURSE(Visit(stmt->init()));
}
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprLoop, true);
block_size_ = 0;
BlockVisitor visitor(this, stmt->AsBreakableStatement(), kExprLoop, true,
0);
if (stmt->cond() != nullptr) {
block_size_++;
current_function_builder_->Emit(kExprIf);

10
test/mjsunit/wasm/asm-wasm.js
View File

@ -15,7 +15,7 @@ function EmptyTest() {
return {caller: caller};
}
assertEquals(11, WASM.asmCompileRun(EmptyTest.toString()));
assertEquals(11, _WASMEXP_.asmCompileRun(EmptyTest.toString()));
function IntTest() {
"use asm";
@ -683,7 +683,7 @@ function TestConditional() {
return {caller:caller};
}
assertEquals(41, WASM.asmCompileRun(TestConditional.toString()));
assertEquals(41, _WASMEXP_.asmCompileRun(TestConditional.toString()));
function TestSwitch() {
"use asm"
@ -710,7 +710,7 @@ function TestSwitch() {
return {caller:caller};
}
assertEquals(23, WASM.asmCompileRun(TestSwitch.toString()));
assertEquals(23, _WASMEXP_.asmCompileRun(TestSwitch.toString()));
function TestSwitchFallthrough() {
"use asm"
@ -731,7 +731,7 @@ function TestSwitchFallthrough() {
return {caller:caller};
}
assertEquals(42, WASM.asmCompileRun(TestSwitchFallthrough.toString()));
assertEquals(42, _WASMEXP_.asmCompileRun(TestSwitchFallthrough.toString()));
function TestNestedSwitch() {
"use asm"
@ -756,4 +756,4 @@ function TestNestedSwitch() {
return {caller:caller};
}
assertEquals(43, WASM.asmCompileRun(TestNestedSwitch.toString()));
assertEquals(43, _WASMEXP_.asmCompileRun(TestNestedSwitch.toString()));