Merge V8 5.2.361.47 DO NOT MERGE
https://chromium.googlesource.com/v8/v8/+/5.2.361.47
FPIIM-449
Change-Id: Ibec421b85a9b88cb3a432ada642e469fe7e78346
(cherry picked from commit bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8)
diff --git a/src/wasm/encoder.h b/src/wasm/encoder.h
index 49a7bf7..0f2118d 100644
--- a/src/wasm/encoder.h
+++ b/src/wasm/encoder.h
@@ -10,6 +10,7 @@
#include "src/base/smart-pointers.h"
+#include "src/wasm/wasm-macro-gen.h"
#include "src/wasm/wasm-module.h"
#include "src/wasm/wasm-opcodes.h"
#include "src/wasm/wasm-result.h"
@@ -28,55 +29,42 @@
void Serialize(byte* buffer, byte** header, byte** body) const;
private:
- WasmFunctionEncoder(Zone* zone, LocalType return_type, bool exported,
- bool external);
+ WasmFunctionEncoder(Zone* zone, LocalDeclEncoder locals, bool exported);
friend class WasmFunctionBuilder;
- uint16_t signature_index_;
- ZoneVector<LocalType> params_;
- uint16_t local_i32_count_;
- uint16_t local_i64_count_;
- uint16_t local_f32_count_;
- uint16_t local_f64_count_;
+ uint32_t signature_index_;
+ LocalDeclEncoder locals_;
bool exported_;
- bool external_;
ZoneVector<uint8_t> body_;
ZoneVector<char> name_;
- bool HasName() const { return (exported_ || external_) && name_.size() > 0; }
+ bool HasName() const { return exported_ && name_.size() > 0; }
};
class WasmFunctionBuilder : public ZoneObject {
public:
- uint16_t AddParam(LocalType type);
- uint16_t AddLocal(LocalType type);
- void ReturnType(LocalType type);
+ void SetSignature(FunctionSig* sig);
+ uint32_t AddLocal(LocalType type);
+ void EmitVarInt(uint32_t val);
void EmitCode(const byte* code, uint32_t code_size);
- void EmitCode(const byte* code, uint32_t code_size,
- const uint32_t* local_indices, uint32_t indices_size);
void Emit(WasmOpcode opcode);
+ void EmitGetLocal(uint32_t index);
+ void EmitSetLocal(uint32_t index);
+ void EmitI32Const(int32_t val);
void EmitWithU8(WasmOpcode opcode, const byte immediate);
void EmitWithU8U8(WasmOpcode opcode, const byte imm1, const byte imm2);
void EmitWithVarInt(WasmOpcode opcode, uint32_t immediate);
- uint32_t EmitEditableVarIntImmediate();
- void EditVarIntImmediate(uint32_t offset, const uint32_t immediate);
void Exported(uint8_t flag);
- void External(uint8_t flag);
- void SetName(const unsigned char* name, int name_length);
+ void SetName(const char* name, int name_length);
WasmFunctionEncoder* Build(Zone* zone, WasmModuleBuilder* mb) const;
private:
explicit WasmFunctionBuilder(Zone* zone);
friend class WasmModuleBuilder;
- LocalType return_type_;
- struct Type;
- ZoneVector<Type> locals_;
+ LocalDeclEncoder locals_;
uint8_t exported_;
- uint8_t external_;
ZoneVector<uint8_t> body_;
- ZoneVector<uint32_t> local_indices_;
ZoneVector<char> name_;
- uint16_t AddVar(LocalType type, bool param);
- void IndexVars(WasmFunctionEncoder* e, uint16_t* var_index) const;
+ void IndexVars(WasmFunctionEncoder* e, uint32_t* var_index) const;
};
class WasmDataSegmentEncoder : public ZoneObject {
@@ -105,6 +93,12 @@
const byte* end_;
};
+struct WasmFunctionImport {
+ uint32_t sig_index;
+ const char* name;
+ int name_length;
+};
+
class WasmModuleWriter : public ZoneObject {
public:
WasmModuleIndex* WriteTo(Zone* zone) const;
@@ -112,10 +106,11 @@
private:
friend class WasmModuleBuilder;
explicit WasmModuleWriter(Zone* zone);
+ ZoneVector<WasmFunctionImport> imports_;
ZoneVector<WasmFunctionEncoder*> functions_;
ZoneVector<WasmDataSegmentEncoder*> data_segments_;
ZoneVector<FunctionSig*> signatures_;
- ZoneVector<uint16_t> indirect_functions_;
+ ZoneVector<uint32_t> indirect_functions_;
ZoneVector<std::pair<MachineType, bool>> globals_;
int start_function_index_;
};
@@ -123,32 +118,33 @@
class WasmModuleBuilder : public ZoneObject {
public:
explicit WasmModuleBuilder(Zone* zone);
- uint16_t AddFunction();
+ uint32_t AddFunction();
uint32_t AddGlobal(MachineType type, bool exported);
WasmFunctionBuilder* FunctionAt(size_t index);
void AddDataSegment(WasmDataSegmentEncoder* data);
- uint16_t AddSignature(FunctionSig* sig);
- void AddIndirectFunction(uint16_t index);
- void MarkStartFunction(uint16_t index);
+ uint32_t AddSignature(FunctionSig* sig);
+ void AddIndirectFunction(uint32_t index);
+ void MarkStartFunction(uint32_t index);
+ uint32_t AddImport(const char* name, int name_length, FunctionSig* sig);
WasmModuleWriter* Build(Zone* zone);
struct CompareFunctionSigs {
bool operator()(FunctionSig* a, FunctionSig* b) const;
};
- typedef ZoneMap<FunctionSig*, uint16_t, CompareFunctionSigs> SignatureMap;
+ typedef ZoneMap<FunctionSig*, uint32_t, CompareFunctionSigs> SignatureMap;
private:
Zone* zone_;
ZoneVector<FunctionSig*> signatures_;
+ ZoneVector<WasmFunctionImport> imports_;
ZoneVector<WasmFunctionBuilder*> functions_;
ZoneVector<WasmDataSegmentEncoder*> data_segments_;
- ZoneVector<uint16_t> indirect_functions_;
+ ZoneVector<uint32_t> indirect_functions_;
ZoneVector<std::pair<MachineType, bool>> globals_;
SignatureMap signature_map_;
int start_function_index_;
};
-std::vector<uint8_t> UnsignedLEB128From(uint32_t result);
} // namespace wasm
} // namespace internal
} // namespace v8