aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/fs/elf.h
diff options
context:
space:
mode:
authorMarvin Borner2020-05-06 19:04:05 +0200
committerMarvin Borner2020-05-06 19:04:05 +0200
commitd94ffac4a584dc7a4f6f2ec567b8caab05ce9253 (patch)
tree559cd596a0a407d4b40c1d12d3c6a0686494da16 /src/kernel/fs/elf.h
parent1a8563a05608b5b5e27eada44cf4790926001c68 (diff)
New build parameters and shared includes
This changes many files but I've just applied some replace commands.. So - nothing special!
Diffstat (limited to 'src/kernel/fs/elf.h')
-rw-r--r--src/kernel/fs/elf.h68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/kernel/fs/elf.h b/src/kernel/fs/elf.h
index 8c7d38a..f9a3562 100644
--- a/src/kernel/fs/elf.h
+++ b/src/kernel/fs/elf.h
@@ -2,7 +2,7 @@
#define MELVIX_ELF_H
#include <stdint.h>
-#include <kernel/tasks/process.h>
+#include <tasks/process.h>
#define ELF_MAG 0x7F // 0
#define ELF_32 (1) // 4: 32-bit Architecture
@@ -29,48 +29,48 @@
#define PF_R 0x4
struct elf_priv_data {
- uint32_t sig;
+ u32 sig;
};
struct elf_header {
- uint8_t ident[16];
- uint16_t type;
- uint16_t machine;
- uint32_t version;
- uint32_t entry;
- uint32_t phoff;
- uint32_t shoff;
- uint32_t flags;
- uint16_t ehsize;
- uint16_t phentsize;
- uint16_t phnum;
- uint16_t shentsize;
- uint16_t shnum;
- uint16_t shstrndx;
+ u8 ident[16];
+ u16 type;
+ u16 machine;
+ u32 version;
+ u32 entry;
+ u32 phoff;
+ u32 shoff;
+ u32 flags;
+ u16 ehsize;
+ u16 phentsize;
+ u16 phnum;
+ u16 shentsize;
+ u16 shnum;
+ u16 shstrndx;
};
struct elf_section_header {
- uint32_t name;
- uint32_t type;
- uint32_t flags;
- uint32_t addr;
- uint32_t offset;
- uint32_t size;
- uint32_t link;
- uint32_t info;
- uint32_t addralign;
- uint32_t entsize;
+ u32 name;
+ u32 type;
+ u32 flags;
+ u32 addr;
+ u32 offset;
+ u32 size;
+ u32 link;
+ u32 info;
+ u32 addralign;
+ u32 entsize;
};
struct elf_program_header {
- uint32_t type;
- uint32_t offset;
- uint32_t vaddr;
- uint32_t paddr;
- uint32_t filesz;
- uint32_t memsz;
- uint32_t flags;
- uint32_t align;
+ u32 type;
+ u32 offset;
+ u32 vaddr;
+ u32 paddr;
+ u32 filesz;
+ u32 memsz;
+ u32 flags;
+ u32 align;
};
int is_elf(struct elf_header *header);