| ... | ... | @@ -32,19 +32,22 @@ const spec = struct { |
| 32 | 32 | pub const base_tag = link.File.Tag.wasm; |
| 33 | 33 | |
| 34 | 34 | pub const FnData = struct { |
| 35 | | funcidx: u32, |
| 35 | /// Generated code for the type of the function |
| 36 | functype: std.ArrayListUnmanaged(u8) = .{}, |
| 37 | /// Generated code for the body of the function |
| 38 | code: std.ArrayListUnmanaged(u8) = .{}, |
| 39 | /// Locations in the generated code where function indexes must be filled in. |
| 40 | /// This must be kept ordered by offset. |
| 41 | idx_refs: std.ArrayListUnmanaged(struct { offset: u32, decl: *Module.Decl }) = .{}, |
| 36 | 42 | }; |
| 37 | 43 | |
| 38 | 44 | base: link.File, |
| 39 | 45 | |
| 40 | | types: Types, |
| 41 | | funcs: Funcs, |
| 42 | | exports: Exports, |
| 43 | | |
| 44 | | /// Array over the section structs used in the various sections above to |
| 45 | | /// allow iteration when shifting sections to make space. |
| 46 | | /// TODO: this should eventually be size 11 when we use all the sections. |
| 47 | | sections: [4]*Section, |
| 46 | /// List of all function Decls to be written to the output file. The index of |
| 47 | /// each Decl in this list at the time of writing the binary is used as the |
| 48 | /// function index. |
| 49 | /// TODO: can/should we access some data structure in Module directly? |
| 50 | funcs: std.ArrayListUnmanaged(*Module.Decl) = .{}, |
| 48 | 51 | |
| 49 | 52 | pub fn openPath(allocator: *Allocator, dir: fs.Dir, sub_path: []const u8, options: link.Options) !*link.File { |
| 50 | 53 | assert(options.object_format == .wasm); |
| ... | ... | @@ -58,10 +61,6 @@ pub fn openPath(allocator: *Allocator, dir: fs.Dir, sub_path: []const u8, option |
| 58 | 61 | |
| 59 | 62 | try file.writeAll(&(spec.magic ++ spec.version)); |
| 60 | 63 | |
| 61 | | // TODO: this should vary depending on the section and be less arbitrary |
| 62 | | const size = 1024; |
| 63 | | const offset = @sizeOf(@TypeOf(spec.magic ++ spec.version)); |
| 64 | | |
| 65 | 64 | wasm.* = .{ |
| 66 | 65 | .base = .{ |
| 67 | 66 | .tag = .wasm, |
| ... | ... | @@ -69,52 +68,42 @@ pub fn openPath(allocator: *Allocator, dir: fs.Dir, sub_path: []const u8, option |
| 69 | 68 | .file = file, |
| 70 | 69 | .allocator = allocator, |
| 71 | 70 | }, |
| 72 | | |
| 73 | | .types = try Types.init(file, offset, size), |
| 74 | | .funcs = try Funcs.init(file, offset + size, size, offset + 3 * size, size), |
| 75 | | .exports = try Exports.init(file, offset + 2 * size, size), |
| 76 | | |
| 77 | | // These must be ordered as they will appear in the output file |
| 78 | | .sections = [_]*Section{ |
| 79 | | &wasm.types.typesec.section, |
| 80 | | &wasm.funcs.funcsec, |
| 81 | | &wasm.exports.exportsec, |
| 82 | | &wasm.funcs.codesec.section, |
| 83 | | }, |
| 84 | 71 | }; |
| 85 | 72 | |
| 86 | | try file.setEndPos(offset + 4 * size); |
| 87 | | |
| 88 | 73 | return &wasm.base; |
| 89 | 74 | } |
| 90 | 75 | |
| 91 | 76 | pub fn deinit(self: *Wasm) void { |
| 92 | | self.types.deinit(); |
| 93 | | self.funcs.deinit(); |
| 77 | for (self.funcs.items) |decl| { |
| 78 | decl.fn_link.wasm.?.functype.deinit(self.base.allocator); |
| 79 | decl.fn_link.wasm.?.code.deinit(self.base.allocator); |
| 80 | decl.fn_link.wasm.?.idx_refs.deinit(self.base.allocator); |
| 81 | } |
| 82 | self.funcs.deinit(self.base.allocator); |
| 94 | 83 | } |
| 95 | 84 | |
| 85 | // Generate code for the Decl, storing it in memory to be later written to |
| 86 | // the file on flush(). |
| 96 | 87 | pub fn updateDecl(self: *Wasm, module: *Module, decl: *Module.Decl) !void { |
| 97 | 88 | if (decl.typed_value.most_recent.typed_value.ty.zigTypeTag() != .Fn) |
| 98 | 89 | return error.TODOImplementNonFnDeclsForWasm; |
| 99 | 90 | |
| 100 | | if (decl.fn_link.wasm) |fn_data| { |
| 101 | | self.funcs.free(fn_data.funcidx); |
| 102 | | } |
| 103 | | |
| 104 | | var buf = std.ArrayList(u8).init(self.base.allocator); |
| 105 | | defer buf.deinit(); |
| 106 | | |
| 107 | | try codegen.genFunctype(&buf, decl); |
| 108 | | const typeidx = try self.types.new(buf.items); |
| 109 | | buf.items.len = 0; |
| 110 | | |
| 111 | | try codegen.genCode(&buf, decl); |
| 112 | | const funcidx = try self.funcs.new(typeidx, buf.items); |
| 113 | | |
| 114 | | decl.fn_link.wasm = .{ .funcidx = funcidx }; |
| 115 | | |
| 116 | | // TODO: we should be more smart and set this only when needed |
| 117 | | self.exports.dirty = true; |
| 91 | if (decl.fn_link.wasm) |*fn_data| { |
| 92 | fn_data.functype.items.len = 0; |
| 93 | fn_data.code.items.len = 0; |
| 94 | fn_data.idx_refs.items.len = 0; |
| 95 | } else { |
| 96 | decl.fn_link.wasm = .{}; |
| 97 | try self.funcs.append(self.base.allocator, decl); |
| 98 | } |
| 99 | const fn_data = &decl.fn_link.wasm.?; |
| 100 | |
| 101 | var managed_functype = fn_data.functype.toManaged(self.base.allocator); |
| 102 | var managed_code = fn_data.code.toManaged(self.base.allocator); |
| 103 | try codegen.genFunctype(&managed_functype, decl); |
| 104 | try codegen.genCode(&managed_code, decl); |
| 105 | fn_data.functype = managed_functype.toUnmanaged(); |
| 106 | fn_data.code = managed_code.toUnmanaged(); |
| 118 | 107 | } |
| 119 | 108 | |
| 120 | 109 | pub fn updateDeclExports( |
| ... | ... | @@ -122,332 +111,141 @@ pub fn updateDeclExports( |
| 122 | 111 | module: *Module, |
| 123 | 112 | decl: *const Module.Decl, |
| 124 | 113 | exports: []const *Module.Export, |
| 125 | | ) !void { |
| 126 | | self.exports.dirty = true; |
| 127 | | } |
| 114 | ) !void {} |
| 128 | 115 | |
| 129 | 116 | pub fn freeDecl(self: *Wasm, decl: *Module.Decl) void { |
| 130 | 117 | // TODO: remove this assert when non-function Decls are implemented |
| 131 | 118 | assert(decl.typed_value.most_recent.typed_value.ty.zigTypeTag() == .Fn); |
| 132 | | if (decl.fn_link.wasm) |fn_data| { |
| 133 | | self.funcs.free(fn_data.funcidx); |
| 134 | | decl.fn_link.wasm = null; |
| 135 | | } |
| 119 | _ = self.funcs.swapRemove(self.getFuncidx(decl).?); |
| 120 | decl.fn_link.wasm.?.functype.deinit(self.base.allocator); |
| 121 | decl.fn_link.wasm.?.code.deinit(self.base.allocator); |
| 122 | decl.fn_link.wasm.?.idx_refs.deinit(self.base.allocator); |
| 123 | decl.fn_link.wasm = null; |
| 136 | 124 | } |
| 137 | 125 | |
| 138 | 126 | pub fn flush(self: *Wasm, module: *Module) !void { |
| 139 | | if (self.exports.dirty) try self.exports.writeAll(module); |
| 140 | | } |
| 141 | | |
| 142 | | /// This struct describes the location of a named section + custom section |
| 143 | | /// padding in the output file. This is all the data we need to allow for |
| 144 | | /// shifting sections around when padding runs out. |
| 145 | | const Section = struct { |
| 146 | | /// The size of a section header: 1 byte section id + 5 bytes |
| 147 | | /// for the fixed-width ULEB128 encoded contents size. |
| 148 | | const header_size = 1 + 5; |
| 149 | | /// Offset of the section id byte from the start of the file. |
| 150 | | offset: u64, |
| 151 | | /// Size of the section, including the header and directly |
| 152 | | /// following custom section used for padding if any. |
| 153 | | size: u64, |
| 154 | | |
| 155 | | /// Resize the usable part of the section, handling the following custom |
| 156 | | /// section used for padding. If there is not enough padding left, shift |
| 157 | | /// all following sections to make space. Takes the current and target |
| 158 | | /// contents sizes of the section as arguments. |
| 159 | | fn resize(self: *Section, file: fs.File, current: u32, target: u32) !void { |
| 160 | | // Section header + target contents size + custom section header |
| 161 | | // + custom section name + empty custom section > owned chunk of the file |
| 162 | | if (header_size + target + header_size + 1 + 0 > self.size) |
| 163 | | return error.TODOImplementSectionShifting; |
| 164 | | |
| 165 | | const new_custom_start = self.offset + header_size + target; |
| 166 | | const new_custom_contents_size = self.size - target - 2 * header_size; |
| 167 | | assert(new_custom_contents_size >= 1); |
| 168 | | // +1 for the name of the custom section, which we set to an empty string |
| 169 | | var custom_header: [header_size + 1]u8 = undefined; |
| 170 | | custom_header[0] = spec.custom_id; |
| 171 | | leb.writeUnsignedFixed(5, custom_header[1..header_size], @intCast(u32, new_custom_contents_size)); |
| 172 | | custom_header[header_size] = 0; |
| 173 | | try file.pwriteAll(&custom_header, new_custom_start); |
| 174 | | } |
| 175 | | }; |
| 176 | | |
| 177 | | /// This can be used to manage the contents of any section which uses a vector |
| 178 | | /// of contents. This interface maintains index stability while allowing for |
| 179 | | /// reuse of "dead" indexes. |
| 180 | | const VecSection = struct { |
| 181 | | /// Represents a single entry in the vector (e.g. a type in the type section) |
| 182 | | const Entry = struct { |
| 183 | | /// Offset from the start of the section contents in bytes |
| 184 | | offset: u32, |
| 185 | | /// Size in bytes of the entry |
| 186 | | size: u32, |
| 187 | | }; |
| 188 | | section: Section, |
| 189 | | /// Size in bytes of the contents of the section. Does not include |
| 190 | | /// the "header" containing the section id and this value. |
| 191 | | contents_size: u32, |
| 192 | | /// List of all entries in the contents of the section. |
| 193 | | entries: std.ArrayListUnmanaged(Entry) = std.ArrayListUnmanaged(Entry){}, |
| 194 | | /// List of indexes of unreferenced entries which may be |
| 195 | | /// overwritten and reused. |
| 196 | | dead_list: std.ArrayListUnmanaged(u32) = std.ArrayListUnmanaged(u32){}, |
| 197 | | |
| 198 | | /// Write the headers of the section and custom padding section |
| 199 | | fn init(comptime section_id: u8, file: fs.File, offset: u64, initial_size: u64) !VecSection { |
| 200 | | // section id, section size, empty vector, custom section id, |
| 201 | | // custom section size, empty custom section name |
| 202 | | var initial_data: [1 + 5 + 5 + 1 + 5 + 1]u8 = undefined; |
| 203 | | |
| 204 | | assert(initial_size >= initial_data.len); |
| 205 | | |
| 206 | | comptime var i = 0; |
| 207 | | initial_data[i] = section_id; |
| 208 | | i += 1; |
| 209 | | leb.writeUnsignedFixed(5, initial_data[i..(i + 5)], 5); |
| 210 | | i += 5; |
| 211 | | leb.writeUnsignedFixed(5, initial_data[i..(i + 5)], 0); |
| 212 | | i += 5; |
| 213 | | initial_data[i] = spec.custom_id; |
| 214 | | i += 1; |
| 215 | | leb.writeUnsignedFixed(5, initial_data[i..(i + 5)], @intCast(u32, initial_size - @sizeOf(@TypeOf(initial_data)))); |
| 216 | | i += 5; |
| 217 | | initial_data[i] = 0; |
| 218 | | |
| 219 | | try file.pwriteAll(&initial_data, offset); |
| 220 | | |
| 221 | | return VecSection{ |
| 222 | | .section = .{ |
| 223 | | .offset = offset, |
| 224 | | .size = initial_size, |
| 225 | | }, |
| 226 | | .contents_size = 5, |
| 227 | | }; |
| 228 | | } |
| 229 | | |
| 230 | | fn deinit(self: *VecSection, allocator: *Allocator) void { |
| 231 | | self.entries.deinit(allocator); |
| 232 | | self.dead_list.deinit(allocator); |
| 233 | | } |
| 234 | | |
| 235 | | /// Write a new entry into the file, returning the index used. |
| 236 | | fn addEntry(self: *VecSection, file: fs.File, allocator: *Allocator, data: []const u8) !u32 { |
| 237 | | // First look for a dead entry we can reuse |
| 238 | | for (self.dead_list.items) |dead_idx, i| { |
| 239 | | const dead_entry = &self.entries.items[dead_idx]; |
| 240 | | if (dead_entry.size == data.len) { |
| 241 | | // Found a dead entry of the right length, overwrite it |
| 242 | | try file.pwriteAll(data, self.section.offset + Section.header_size + dead_entry.offset); |
| 243 | | _ = self.dead_list.swapRemove(i); |
| 244 | | return dead_idx; |
| 245 | | } |
| 127 | const file = self.base.file.?; |
| 128 | const header_size = 5 + 1; |
| 129 | |
| 130 | // No need to rewrite the magic/version header |
| 131 | try file.setEndPos(@sizeOf(@TypeOf(spec.magic ++ spec.version))); |
| 132 | try file.seekTo(@sizeOf(@TypeOf(spec.magic ++ spec.version))); |
| 133 | |
| 134 | // Type section |
| 135 | { |
| 136 | const header_offset = try reserveVecSectionHeader(file); |
| 137 | for (self.funcs.items) |decl| { |
| 138 | try file.writeAll(decl.fn_link.wasm.?.functype.items); |
| 246 | 139 | } |
| 247 | | |
| 248 | | // TODO: We can be more efficient if we special-case one or |
| 249 | | // more consecutive dead entries at the end of the vector. |
| 250 | | |
| 251 | | // We failed to find a dead entry to reuse, so write the new |
| 252 | | // entry to the end of the section. |
| 253 | | try self.section.resize(file, self.contents_size, self.contents_size + @intCast(u32, data.len)); |
| 254 | | try file.pwriteAll(data, self.section.offset + Section.header_size + self.contents_size); |
| 255 | | try self.entries.append(allocator, .{ |
| 256 | | .offset = self.contents_size, |
| 257 | | .size = @intCast(u32, data.len), |
| 258 | | }); |
| 259 | | self.contents_size += @intCast(u32, data.len); |
| 260 | | // Make sure the dead list always has enough space to store all free'd |
| 261 | | // entries. This makes it so that delEntry() cannot fail. |
| 262 | | // TODO: figure out a better way that doesn't waste as much memory |
| 263 | | try self.dead_list.ensureCapacity(allocator, self.entries.items.len); |
| 264 | | |
| 265 | | // Update the size in the section header and the item count of |
| 266 | | // the contents vector. |
| 267 | | var size_and_count: [10]u8 = undefined; |
| 268 | | leb.writeUnsignedFixed(5, size_and_count[0..5], self.contents_size); |
| 269 | | leb.writeUnsignedFixed(5, size_and_count[5..], @intCast(u32, self.entries.items.len)); |
| 270 | | try file.pwriteAll(&size_and_count, self.section.offset + 1); |
| 271 | | |
| 272 | | return @intCast(u32, self.entries.items.len - 1); |
| 273 | | } |
| 274 | | |
| 275 | | /// Mark the type referenced by the given index as dead. |
| 276 | | fn delEntry(self: *VecSection, index: u32) void { |
| 277 | | self.dead_list.appendAssumeCapacity(index); |
| 278 | | } |
| 279 | | }; |
| 280 | | |
| 281 | | const Types = struct { |
| 282 | | typesec: VecSection, |
| 283 | | |
| 284 | | fn init(file: fs.File, offset: u64, initial_size: u64) !Types { |
| 285 | | return Types{ .typesec = try VecSection.init(spec.types_id, file, offset, initial_size) }; |
| 286 | | } |
| 287 | | |
| 288 | | fn deinit(self: *Types) void { |
| 289 | | const wasm = @fieldParentPtr(Wasm, "types", self); |
| 290 | | self.typesec.deinit(wasm.base.allocator); |
| 291 | | } |
| 292 | | |
| 293 | | fn new(self: *Types, data: []const u8) !u32 { |
| 294 | | const wasm = @fieldParentPtr(Wasm, "types", self); |
| 295 | | return self.typesec.addEntry(wasm.base.file.?, wasm.base.allocator, data); |
| 296 | | } |
| 297 | | |
| 298 | | fn free(self: *Types, typeidx: u32) void { |
| 299 | | self.typesec.delEntry(typeidx); |
| 300 | | } |
| 301 | | }; |
| 302 | | |
| 303 | | const Funcs = struct { |
| 304 | | /// This section needs special handling to keep the indexes matching with |
| 305 | | /// the codesec, so we cant just use a VecSection. |
| 306 | | funcsec: Section, |
| 307 | | /// The typeidx stored for each function, indexed by funcidx. |
| 308 | | func_types: std.ArrayListUnmanaged(u32) = std.ArrayListUnmanaged(u32){}, |
| 309 | | codesec: VecSection, |
| 310 | | |
| 311 | | fn init(file: fs.File, funcs_offset: u64, funcs_size: u64, code_offset: u64, code_size: u64) !Funcs { |
| 312 | | return Funcs{ |
| 313 | | .funcsec = (try VecSection.init(spec.funcs_id, file, funcs_offset, funcs_size)).section, |
| 314 | | .codesec = try VecSection.init(spec.code_id, file, code_offset, code_size), |
| 315 | | }; |
| 316 | | } |
| 317 | | |
| 318 | | fn deinit(self: *Funcs) void { |
| 319 | | const wasm = @fieldParentPtr(Wasm, "funcs", self); |
| 320 | | self.func_types.deinit(wasm.base.allocator); |
| 321 | | self.codesec.deinit(wasm.base.allocator); |
| 322 | | } |
| 323 | | |
| 324 | | /// Add a new function to the binary, first finding space for and writing |
| 325 | | /// the code then writing the typeidx to the corresponding index in the |
| 326 | | /// funcsec. Returns the function index used. |
| 327 | | fn new(self: *Funcs, typeidx: u32, code: []const u8) !u32 { |
| 328 | | const wasm = @fieldParentPtr(Wasm, "funcs", self); |
| 329 | | const file = wasm.base.file.?; |
| 330 | | const allocator = wasm.base.allocator; |
| 331 | | |
| 332 | | assert(self.func_types.items.len == self.codesec.entries.items.len); |
| 333 | | |
| 334 | | // TODO: consider nop-padding the code if there is a close but not perfect fit |
| 335 | | const funcidx = try self.codesec.addEntry(file, allocator, code); |
| 336 | | |
| 337 | | if (self.func_types.items.len < self.codesec.entries.items.len) { |
| 338 | | // u32 vector length + funcs_count u32s in the vector |
| 339 | | const current = 5 + @intCast(u32, self.func_types.items.len) * 5; |
| 340 | | try self.funcsec.resize(file, current, current + 5); |
| 341 | | try self.func_types.append(allocator, typeidx); |
| 342 | | |
| 343 | | // Update the size in the section header and the item count of |
| 344 | | // the contents vector. |
| 345 | | const count = @intCast(u32, self.func_types.items.len); |
| 346 | | var size_and_count: [10]u8 = undefined; |
| 347 | | leb.writeUnsignedFixed(5, size_and_count[0..5], 5 + count * 5); |
| 348 | | leb.writeUnsignedFixed(5, size_and_count[5..], count); |
| 349 | | try file.pwriteAll(&size_and_count, self.funcsec.offset + 1); |
| 350 | | } else { |
| 351 | | // We are overwriting a dead function and may now free the type |
| 352 | | wasm.types.free(self.func_types.items[funcidx]); |
| 353 | | } |
| 354 | | |
| 355 | | assert(self.func_types.items.len == self.codesec.entries.items.len); |
| 356 | | |
| 357 | | var typeidx_leb: [5]u8 = undefined; |
| 358 | | leb.writeUnsignedFixed(5, &typeidx_leb, typeidx); |
| 359 | | try file.pwriteAll(&typeidx_leb, self.funcsec.offset + Section.header_size + 5 + funcidx * 5); |
| 360 | | |
| 361 | | return funcidx; |
| 362 | | } |
| 363 | | |
| 364 | | fn free(self: *Funcs, funcidx: u32) void { |
| 365 | | self.codesec.delEntry(funcidx); |
| 366 | | } |
| 367 | | }; |
| 368 | | |
| 369 | | /// Exports are tricky. We can't leave dead entries in the binary as they |
| 370 | | /// would obviously be visible from the execution environment. The simplest |
| 371 | | /// way to work around this is to re-emit the export section whenever |
| 372 | | /// something changes. This also makes it easier to ensure exported function |
| 373 | | /// and global indexes are updated as they change. |
| 374 | | const Exports = struct { |
| 375 | | exportsec: Section, |
| 376 | | /// Size in bytes of the contents of the section. Does not include |
| 377 | | /// the "header" containing the section id and this value. |
| 378 | | contents_size: u32, |
| 379 | | /// If this is true, then exports will be rewritten on flush() |
| 380 | | dirty: bool, |
| 381 | | |
| 382 | | fn init(file: fs.File, offset: u64, initial_size: u64) !Exports { |
| 383 | | return Exports{ |
| 384 | | .exportsec = (try VecSection.init(spec.exports_id, file, offset, initial_size)).section, |
| 385 | | .contents_size = 5, |
| 386 | | .dirty = false, |
| 387 | | }; |
| 388 | | } |
| 389 | | |
| 390 | | fn writeAll(self: *Exports, module: *Module) !void { |
| 391 | | const wasm = @fieldParentPtr(Wasm, "exports", self); |
| 392 | | const file = wasm.base.file.?; |
| 393 | | var buf: [5]u8 = undefined; |
| 394 | | |
| 395 | | // First ensure the section is the right size |
| 396 | | var export_count: u32 = 0; |
| 397 | | var new_contents_size: u32 = 5; |
| 140 | try writeVecSectionHeader( |
| 141 | file, |
| 142 | header_offset, |
| 143 | spec.types_id, |
| 144 | @intCast(u32, (try file.getPos()) - header_offset - header_size), |
| 145 | @intCast(u32, self.funcs.items.len), |
| 146 | ); |
| 147 | } |
| 148 | |
| 149 | // Function section |
| 150 | { |
| 151 | const header_offset = try reserveVecSectionHeader(file); |
| 152 | const writer = file.writer(); |
| 153 | for (self.funcs.items) |_, typeidx| try leb.writeULEB128(writer, @intCast(u32, typeidx)); |
| 154 | try writeVecSectionHeader( |
| 155 | file, |
| 156 | header_offset, |
| 157 | spec.funcs_id, |
| 158 | @intCast(u32, (try file.getPos()) - header_offset - header_size), |
| 159 | @intCast(u32, self.funcs.items.len), |
| 160 | ); |
| 161 | } |
| 162 | |
| 163 | // Export section |
| 164 | { |
| 165 | const header_offset = try reserveVecSectionHeader(file); |
| 166 | const writer = file.writer(); |
| 167 | var count: u32 = 0; |
| 398 | 168 | for (module.decl_exports.entries.items) |entry| { |
| 399 | | for (entry.value) |e| { |
| 400 | | export_count += 1; |
| 401 | | new_contents_size += calcSize(e); |
| 169 | for (entry.value) |exprt| { |
| 170 | // Export name length + name |
| 171 | try leb.writeULEB128(writer, @intCast(u32, exprt.options.name.len)); |
| 172 | try writer.writeAll(exprt.options.name); |
| 173 | |
| 174 | switch (exprt.exported_decl.typed_value.most_recent.typed_value.ty.zigTypeTag()) { |
| 175 | .Fn => { |
| 176 | // Type of the export |
| 177 | try writer.writeByte(0x00); |
| 178 | // Exported function index |
| 179 | try leb.writeULEB128(writer, self.getFuncidx(exprt.exported_decl).?); |
| 180 | }, |
| 181 | else => return error.TODOImplementNonFnDeclsForWasm, |
| 182 | } |
| 183 | |
| 184 | count += 1; |
| 402 | 185 | } |
| 403 | 186 | } |
| 404 | | if (new_contents_size != self.contents_size) { |
| 405 | | try self.exportsec.resize(file, self.contents_size, new_contents_size); |
| 406 | | leb.writeUnsignedFixed(5, &buf, new_contents_size); |
| 407 | | try file.pwriteAll(&buf, self.exportsec.offset + 1); |
| 408 | | } |
| 409 | | |
| 410 | | try file.seekTo(self.exportsec.offset + Section.header_size); |
| 187 | try writeVecSectionHeader( |
| 188 | file, |
| 189 | header_offset, |
| 190 | spec.exports_id, |
| 191 | @intCast(u32, (try file.getPos()) - header_offset - header_size), |
| 192 | count, |
| 193 | ); |
| 194 | } |
| 195 | |
| 196 | // Code section |
| 197 | { |
| 198 | const header_offset = try reserveVecSectionHeader(file); |
| 411 | 199 | const writer = file.writer(); |
| 200 | for (self.funcs.items) |decl| { |
| 201 | const fn_data = &decl.fn_link.wasm.?; |
| 202 | |
| 203 | // Write the already generated code to the file, inserting |
| 204 | // function indexes where required. |
| 205 | var current: u32 = 0; |
| 206 | for (fn_data.idx_refs.items) |idx_ref| { |
| 207 | try writer.writeAll(fn_data.code.items[current..idx_ref.offset]); |
| 208 | current = idx_ref.offset; |
| 209 | // Use a fixed width here to make calculating the code size |
| 210 | // in codegen.wasm.genCode() simpler. |
| 211 | var buf: [5]u8 = undefined; |
| 212 | leb.writeUnsignedFixed(5, &buf, self.getFuncidx(idx_ref.decl).?); |
| 213 | try writer.writeAll(&buf); |
| 214 | } |
| 412 | 215 | |
| 413 | | // Length of the exports vec |
| 414 | | leb.writeUnsignedFixed(5, &buf, export_count); |
| 415 | | try writer.writeAll(&buf); |
| 416 | | |
| 417 | | for (module.decl_exports.entries.items) |entry| |
| 418 | | for (entry.value) |e| try writeExport(writer, e); |
| 419 | | |
| 420 | | self.dirty = false; |
| 216 | try writer.writeAll(fn_data.code.items[current..]); |
| 217 | } |
| 218 | try writeVecSectionHeader( |
| 219 | file, |
| 220 | header_offset, |
| 221 | spec.code_id, |
| 222 | @intCast(u32, (try file.getPos()) - header_offset - header_size), |
| 223 | @intCast(u32, self.funcs.items.len), |
| 224 | ); |
| 421 | 225 | } |
| 226 | } |
| 422 | 227 | |
| 423 | | /// Return the total number of bytes an export will take. |
| 424 | | /// TODO: fixed-width LEB128 is currently used for simplicity, but should |
| 425 | | /// be replaced with proper variable-length LEB128 as it is inefficient. |
| 426 | | fn calcSize(e: *Module.Export) u32 { |
| 427 | | // LEB128 name length + name bytes + export type + LEB128 index |
| 428 | | return 5 + @intCast(u32, e.options.name.len) + 1 + 5; |
| 429 | | } |
| 228 | /// Get the current index of a given Decl in the function list |
| 229 | /// TODO: we could maintain a hash map to potentially make this |
| 230 | fn getFuncidx(self: Wasm, decl: *Module.Decl) ?u32 { |
| 231 | return for (self.funcs.items) |func, idx| { |
| 232 | if (func == decl) break @intCast(u32, idx); |
| 233 | } else null; |
| 234 | } |
| 430 | 235 | |
| 431 | | /// Write the data for a single export to the given file at a given offset. |
| 432 | | /// TODO: fixed-width LEB128 is currently used for simplicity, but should |
| 433 | | /// be replaced with proper variable-length LEB128 as it is inefficient. |
| 434 | | fn writeExport(writer: anytype, e: *Module.Export) !void { |
| 435 | | var buf: [5]u8 = undefined; |
| 436 | | |
| 437 | | // Export name length + name |
| 438 | | leb.writeUnsignedFixed(5, &buf, @intCast(u32, e.options.name.len)); |
| 439 | | try writer.writeAll(&buf); |
| 440 | | try writer.writeAll(e.options.name); |
| 441 | | |
| 442 | | switch (e.exported_decl.typed_value.most_recent.typed_value.ty.zigTypeTag()) { |
| 443 | | .Fn => { |
| 444 | | // Type of the export |
| 445 | | try writer.writeByte(0x00); |
| 446 | | // Exported function index |
| 447 | | leb.writeUnsignedFixed(5, &buf, e.exported_decl.fn_link.wasm.?.funcidx); |
| 448 | | try writer.writeAll(&buf); |
| 449 | | }, |
| 450 | | else => return error.TODOImplementNonFnDeclsForWasm, |
| 451 | | } |
| 452 | | } |
| 453 | | }; |
| 236 | fn reserveVecSectionHeader(file: fs.File) !u64 { |
| 237 | // section id + fixed leb contents size + fixed leb vector length |
| 238 | const header_size = 1 + 5 + 5; |
| 239 | // TODO: this should be a single lseek(2) call, but fs.File does not |
| 240 | // currently provide a way to do this. |
| 241 | try file.seekBy(header_size); |
| 242 | return (try file.getPos()) - header_size; |
| 243 | } |
| 244 | |
| 245 | fn writeVecSectionHeader(file: fs.File, offset: u64, section: u8, size: u32, items: u32) !void { |
| 246 | var buf: [1 + 5 + 5]u8 = undefined; |
| 247 | buf[0] = section; |
| 248 | leb.writeUnsignedFixed(5, buf[1..6], size); |
| 249 | leb.writeUnsignedFixed(5, buf[6..], items); |
| 250 | try file.pwriteAll(&buf, offset); |
| 251 | } |
Andrew Kelley <andrew@ziglang.org> 2020-08-18 21:37:20-04:00
GitHub <noreply@github.com> 2020-08-18 21:37:20-04:00
Signed by PGP key 4AEE18F83AFDEB23
test