From cc5e2ae695cfe199044ef614b2dfc1991095bcc0 Mon Sep 17 00:00:00 2001 From: Sunil Nimmagadda Date: Fri, 30 Oct 2026 11:35:52 +0530 Subject: Untangle segment vs segments. Let the elf module handle just a single segment/section while the wrapper does the iteration. --- elf/segment.lua | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) (limited to 'elf/segment.lua') diff --git a/elf/segment.lua b/elf/segment.lua index 6b3c635..8af9146 100644 --- a/elf/segment.lua +++ b/elf/segment.lua @@ -12,29 +12,23 @@ local fmt = require("elf.fmt") ---@field align? integer ---@field first_section? string ---@field last_section? string - ----@class Segments local M = {} -function M.normalize(phdrs) - for _, phdr in ipairs(phdrs) do - if type(phdr) ~= "table" then error("segment must be table", 3) end - if not phdr.type then error("type is required in segment", 3) end +function M.normalize(phdr) + if type(phdr) ~= "table" then error("segment must be table", 3) end + if not phdr.type then error("type is required in segment", 3) end - phdr.flags = phdr.flags or 0 - phdr.offset = phdr.offset or 0 - phdr.vaddr = phdr.vaddr or 0 - phdr.paddr = phdr.paddr or 0 - phdr.filesz = phdr.filesz or 0 - phdr.memsz = phdr.memsz or 0 - phdr.align = phdr.align or 1 - end + phdr.flags = phdr.flags or 0 + phdr.offset = phdr.offset or 0 + phdr.vaddr = phdr.vaddr or 0 + phdr.paddr = phdr.paddr or 0 + phdr.filesz = phdr.filesz or 0 + phdr.memsz = phdr.memsz or 0 + phdr.align = phdr.align or 1 end -function M.validate(phdrs) - for _, phdr in ipairs(phdrs) do - -- TODO validations - end +function M.validate(phdr) + -- TODO validations end ---@param phdr Segment @@ -71,19 +65,14 @@ local function pack64(phdr, endian) phdr.align) end ----@param phdrs Segment[] +---@param phdr Segment ---@param endian Endian ---@param class Class ---@return string ---@nodiscard -function M.pack(phdrs, endian, class) - local p = {} - for i, phdr in ipairs(phdrs) do - p[i] = (class == ec.Class.bit32) and - pack32(phdr, endian) or - pack64(phdr, endian) - end - return table.concat(p) +function M.pack(phdr, endian, class) + return (class == ec.Class.bit32) and + pack32(phdr, endian) or pack64(phdr, endian) end return M -- cgit v1.3