#include <fcntl.h>
#include <getopt.h>
#include <sys/stat.h>
-#include <arpa/inet.h>
#include "common.h"
#include "cbfs.h"
if (phdr[i].p_filesz == 0) {
segs[segments].type = PAYLOAD_SEGMENT_BSS;
segs[segments].load_addr =
- (unsigned long long)htonl(phdr[i].p_paddr);
+ (uint64_t)htonll(phdr[i].p_paddr);
segs[segments].mem_len =
- (unsigned int)htonl(phdr[i].p_memsz);
+ (uint32_t)htonl(phdr[i].p_memsz);
segs[segments].offset = htonl(doffset);
segments++;
continue;
}
- segs[segments].type = PAYLOAD_SEGMENT_DATA;
- segs[segments].load_addr = (unsigned int)htonl(phdr[i].p_paddr);
- segs[segments].mem_len = (unsigned int)htonl(phdr[i].p_memsz);
+ if (phdr[i].p_flags & PF_X)
+ segs[segments].type = PAYLOAD_SEGMENT_CODE;
+ else
+ segs[segments].type = PAYLOAD_SEGMENT_DATA;
+ segs[segments].load_addr = (uint64_t)htonll(phdr[i].p_paddr);
+ segs[segments].mem_len = (uint32_t)htonl(phdr[i].p_memsz);
segs[segments].compression = htonl(algo);
segs[segments].offset = htonl(doffset);
}
segs[segments].type = PAYLOAD_SEGMENT_ENTRY;
- segs[segments++].load_addr = (unsigned long long)htonl(ehdr->e_entry);
+ segs[segments++].load_addr = (uint64_t)htonll(ehdr->e_entry);
*output = sptr;