Skip to content

Commit

Permalink
Update testsuite
Browse files Browse the repository at this point in the history 
Remove test/binary/bad-function-missing-end.txt which is now
covered upstream: WebAssembly/spec#1405
  • Loading branch information
@sbc100
sbc100 committed Jan 10, 2022
1 parent 3cd653a commit 50568f4
Show file tree
Hide file tree
Showing 15 changed files with 345 additions and 285 deletions.
12 changes: 8 additions & 4 deletions src/binary-reader-ir.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,12 @@ class BinaryReaderIR : public BinaryReaderNop {
Result EndFunctionBody(Index index) override;
Result OnSimdLaneOpExpr(Opcode opcode, uint64_t value) override;
Result OnSimdLoadLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override;
Result OnSimdStoreLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override;
Expand Down Expand Up @@ -1099,19 +1101,21 @@ Result BinaryReaderIR::OnSimdLaneOpExpr(Opcode opcode, uint64_t value) {
}

Result BinaryReaderIR::OnSimdLoadLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) {
return AppendExpr(
MakeUnique<SimdLoadLaneExpr>(opcode, 1 << alignment_log2, offset, value));
return AppendExpr(MakeUnique<SimdLoadLaneExpr>(
opcode, Var(memidx), 1 << alignment_log2, offset, value));
}

Result BinaryReaderIR::OnSimdStoreLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) {
return AppendExpr(MakeUnique<SimdStoreLaneExpr>(opcode, 1 << alignment_log2,
offset, value));
return AppendExpr(MakeUnique<SimdStoreLaneExpr>(
opcode, Var(memidx), 1 << alignment_log2, offset, value));
}

Result BinaryReaderIR::OnSimdShuffleOpExpr(Opcode opcode, v128 value) {
Expand Down
15 changes: 9 additions & 6 deletions src/binary-reader-logging.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -717,12 +717,15 @@ Result BinaryReaderLogging::OnComdatEntry(ComdatType kind, Index index) {
}

#define DEFINE_SIMD_LOAD_STORE_LANE_OPCODE(name) \
Result BinaryReaderLogging::name(Opcode opcode, Address alignment_log2, \
Address offset, uint64_t value) { \
LOGF(#name "(opcode: \"%s\" (%u), align log2: %" PRIaddress \
", offset: %" PRIaddress ", lane: %" PRIu64 ")\n", \
opcode.GetName(), opcode.GetCode(), alignment_log2, offset, value); \
return reader_->name(opcode, alignment_log2, offset, value); \
Result BinaryReaderLogging::name(Opcode opcode, Index memidx, \
Address alignment_log2, Address offset, \
uint64_t value) { \
LOGF(#name "(opcode: \"%s\" (%u), memidx: %" PRIindex \
", align log2: %" PRIaddress ", offset: %" PRIaddress \
", lane: %" PRIu64 ")\n", \
opcode.GetName(), opcode.GetCode(), memidx, alignment_log2, offset, \
value); \
return reader_->name(opcode, memidx, alignment_log2, offset, value); \
}

#define DEFINE0(name) \
Expand Down
2 changes: 2 additions & 0 deletions src/binary-reader-logging.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,12 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
Result EndCodeSection() override;
Result OnSimdLaneOpExpr(Opcode opcode, uint64_t value) override;
Result OnSimdLoadLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override;
Result OnSimdStoreLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override;
Expand Down
2 changes: 2 additions & 0 deletions src/binary-reader-nop.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,14 @@ class BinaryReaderNop : public BinaryReaderDelegate {
return Result::Ok;
}
Result OnSimdLoadLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override {
return Result::Ok;
}
Result OnSimdStoreLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override {
Expand Down
20 changes: 18 additions & 2 deletions src/binary-reader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1328,12 +1328,20 @@ Result BinaryReader::ReadInstructions(bool stop_on_end,
case Opcode::V128Load64Lane: {
Address alignment_log2;
CHECK_RESULT(ReadAlignment(&alignment_log2, "load alignment"));
Index memidx = 0;
if (alignment_log2 >> 6) {
ERROR_IF(!options_.features.multi_memory_enabled(),
"multi_memory not allowed");
CHECK_RESULT(ReadMemidx(&memidx, "store memidx"));
alignment_log2 = alignment_log2 & ((1 << 6) - 1);
}
Address offset;
CHECK_RESULT(ReadAddress(&offset, 0, "load offset"));
uint8_t lane_val;
CHECK_RESULT(ReadU8(&lane_val, "Lane idx"));

CALLBACK(OnSimdLoadLaneExpr, opcode, alignment_log2, offset, lane_val);
CALLBACK(OnSimdLoadLaneExpr, opcode, memidx, alignment_log2, offset,
lane_val);
CALLBACK(OnOpcodeUint32Uint32Uint32, alignment_log2, offset, lane_val);
break;
}
Expand All @@ -1343,12 +1351,20 @@ Result BinaryReader::ReadInstructions(bool stop_on_end,
case Opcode::V128Store64Lane: {
Address alignment_log2;
CHECK_RESULT(ReadAlignment(&alignment_log2, "load alignment"));
Index memidx = 0;
if (alignment_log2 >> 6) {
ERROR_IF(!options_.features.multi_memory_enabled(),
"multi_memory not allowed");
CHECK_RESULT(ReadMemidx(&memidx, "store memidx"));
alignment_log2 = alignment_log2 & ((1 << 6) - 1);
}
Address offset;
CHECK_RESULT(ReadAddress(&offset, 0, "load offset"));
uint8_t lane_val;
CHECK_RESULT(ReadU8(&lane_val, "Lane idx"));

CALLBACK(OnSimdStoreLaneExpr, opcode, alignment_log2, offset, lane_val);
CALLBACK(OnSimdStoreLaneExpr, opcode, memidx, alignment_log2, offset,
lane_val);
CALLBACK(OnOpcodeUint32Uint32Uint32, alignment_log2, offset, lane_val);
break;
}
Expand Down
2 changes: 2 additions & 0 deletions src/binary-reader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,12 @@ class BinaryReaderDelegate {
virtual Result OnSimdLaneOpExpr(Opcode opcode, uint64_t value) = 0;
virtual Result OnSimdShuffleOpExpr(Opcode opcode, v128 value) = 0;
virtual Result OnSimdLoadLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) = 0;
virtual Result OnSimdStoreLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) = 0;
Expand Down
8 changes: 6 additions & 2 deletions src/interp/binary-reader-interp.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,12 @@ class BinaryReaderInterp : public BinaryReaderNop {
Result EndFunctionBody(Index index) override;
Result OnSimdLaneOpExpr(Opcode opcode, uint64_t value) override;
Result OnSimdLoadLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override;
Result OnSimdStoreLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) override;
Expand Down Expand Up @@ -901,22 +903,24 @@ uint32_t GetAlignment(Address alignment_log2) {
}

Result BinaryReaderInterp::OnSimdLoadLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) {
CHECK_RESULT(validator_.OnSimdLoadLane(GetLocation(), opcode,
GetAlignment(alignment_log2), value));
istream_.Emit(opcode, kMemoryIndex0, offset, static_cast<u8>(value));
istream_.Emit(opcode, memidx, offset, static_cast<u8>(value));
return Result::Ok;
}

Result BinaryReaderInterp::OnSimdStoreLaneExpr(Opcode opcode,
Index memidx,
Address alignment_log2,
Address offset,
uint64_t value) {
CHECK_RESULT(validator_.OnSimdStoreLane(GetLocation(), opcode,
GetAlignment(alignment_log2), value));
istream_.Emit(opcode, kMemoryIndex0, offset, static_cast<u8>(value));
istream_.Emit(opcode, memidx, offset, static_cast<u8>(value));
return Result::Ok;
}

Expand Down
14 changes: 10 additions & 4 deletions src/ir.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,35 +501,41 @@ class SimdLaneOpExpr : public ExprMixin<ExprType::SimdLaneOp> {
uint64_t val;
};

class SimdLoadLaneExpr : public OpcodeExpr<ExprType::SimdLoadLane> {
class SimdLoadLaneExpr : public MemoryExpr<ExprType::SimdLoadLane> {
public:
SimdLoadLaneExpr(Opcode opcode,
Var memidx,
Address align,
Address offset,
uint64_t val,
const Location& loc = Location())
: OpcodeExpr<ExprType::SimdLoadLane>(opcode, loc),
: MemoryExpr<ExprType::SimdLoadLane>(memidx, loc),
opcode(opcode),
align(align),
offset(offset),
val(val) {}

Opcode opcode;
Address align;
Address offset;
uint64_t val;
};

class SimdStoreLaneExpr : public OpcodeExpr<ExprType::SimdStoreLane> {
class SimdStoreLaneExpr : public MemoryExpr<ExprType::SimdStoreLane> {
public:
SimdStoreLaneExpr(Opcode opcode,
Var memidx,
Address align,
Address offset,
uint64_t val,
const Location& loc = Location())
: OpcodeExpr<ExprType::SimdStoreLane>(opcode, loc),
: MemoryExpr<ExprType::SimdStoreLane>(memidx, loc),
opcode(opcode),
align(align),
offset(offset),
val(val) {}

Opcode opcode;
Address align;
Address offset;
uint64_t val;
Expand Down
26 changes: 23 additions & 3 deletions src/wast-parser.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,8 @@ TokenTypePair WastParser::PeekPair() {
return TokenTypePair{{Peek(), Peek(1)}};
}

bool WastParser::PeekMatch(TokenType type) {
return Peek() == type;
bool WastParser::PeekMatch(TokenType type, size_t n) {
return Peek(n) == type;
}

bool WastParser::PeekMatchLpar(TokenType type) {
Expand Down Expand Up @@ -1945,6 +1945,26 @@ Result WastParser::ParseSIMDLoadStoreInstr(Location loc,
std::unique_ptr<Expr>* out_expr) {
ErrorUnlessOpcodeEnabled(token);

Var memidx(0, loc);

if (options_->features.multi_memory_enabled()) {
// We have to be a little careful when reading the memeory index.
// If there is just a single integer folloing the instruction that
// represents the lane index, so we check for either a pair of intergers
// or an integers followed by offset= or align=.
bool try_read_mem_index = true;
if (PeekMatch(TokenType::Nat)) {
// The next token could be a memory index or a lane index
if (!PeekMatch(TokenType::OffsetEqNat, 1) &&
!PeekMatch(TokenType::AlignEqNat, 1) &&
!PeekMatch(TokenType::Nat, 1)) {
try_read_mem_index = false;
}
}
if (try_read_mem_index) {
CHECK_RESULT(ParseMemidx(loc, &memidx));
}
}
Address offset;
Address align;
ParseOffsetOpt(&offset);
Expand All @@ -1957,7 +1977,7 @@ Result WastParser::ParseSIMDLoadStoreInstr(Location loc,
return Result::Error;
}

out_expr->reset(new T(token.opcode(), align, offset, lane_idx, loc));
out_expr->reset(new T(token.opcode(), memidx, align, offset, lane_idx, loc));
return Result::Ok;
}

Expand Down
2 changes: 1 addition & 1 deletion src/wast-parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class WastParser {
TokenTypePair PeekPair();

// Returns true if the next token's type is equal to the parameter.
bool PeekMatch(TokenType);
bool PeekMatch(TokenType, size_t n = 0);

// Returns true if the next token's type is '(' and the following token is
// equal to the parameter.
Expand Down
17 changes: 0 additions & 17 deletions test/binary/bad-function-missing-end.txt
View file

This file was deleted.

Loading

0 comments on commit 50568f4

Please sign in to comment.