gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch: x86 -> x86_64 and build system changes

Browse Source
This commit is contained in:
Balazs Gerofi
2017-10-10 23:24:07 +09:00
committed by Hannes Weisbach
parent 51982de36b
commit 43ecf06e83
70 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
arch/x86_64/elfboot/Makefile Normal file
View File

@@ -0,0 +1,36 @@
DEST=$(O)/elfboot
CFLAGS=-c -Wall -O
CFLAGS_TEST=-DTEST
all: $(DEST) $(DEST)/elfboot
$(DEST)/elfboot: $(DEST)/elfboot.bin
cp $^ $@
truncate -s $(shell expr '(' `stat -c '%s' $^` + 4095 ')' / 4096 '*' 4096) $@
$(DEST)/elfboot.bin: $(DEST)/elfboot.elf
$(OBJCOPY) -O binary $^ $@
$(DEST)/elfboot.elf: $(DEST)/head.o $(DEST)/elfboot.raw.o raw.lds
$(LD) $(LDFLAGS_RAW) -T raw.lds -o $@ $^
$(DEST)/elfboot_test: $(DEST)/elfboot.test.o $(DEST)/test_main.o
$(CC) -o $@ $^
$(DEST)/head.o: head.S
$(CC) $(CFLAGS) -o $@ $^
$(DEST)/elfboot.raw.o: elfboot.c
$(CC) $(CFLAGS) -o $@ $^
$(DEST)/elfboot.test.o: elfboot.c
$(CC) $(CFLAGS) $(CFLAGS_TEST) -o $@ $^
clean:
$(RM) $(DEST)/elfboot *.bin $(DEST)/*.elf $(DEST)/elfboot_test *.o
disas:
$(OBJDUMP) -b binary -m i386:x86-64 -D $(DEST)/elfboot.bin
$(DEST):
@mkdir -p $(DEST)

96
arch/x86_64/elfboot/elfboot.c Normal file
View File

@@ -0,0 +1,96 @@
/**
* \file elfboot.c
* License details are found in the file LICENSE.
* \brief
* Load an ELF image.
* \author Taku Shimosawa <shimosawa@is.s.u-tokyo.ac.jp> \par
* Copyright (C) 2011 - 2012 Taku Shimosawa
*/
/*
* HISTORY
*/
#include <elf.h>
#include "test.h"
#ifdef TEST
static void *memcpy(void *dest, void *src, unsigned long len)
{
dprintf("Copying %p to %p for %08ld bytes\n", src, dest, len);
return dest;
}
static void *memset(void *dest, int v, unsigned long len)
{
dprintf("Filling %p with %02x for %08ld bytes\n", dest, (unsigned char)v, len);
return dest;
}
#else
static void *memcpy(void *dest, void *src, unsigned long len)
{
char *d = dest, *s = src;
for ( ; len ; len--) {
*(d++) = *(s++);
}
return d;
}
static void *memset(void *dest, int v, unsigned long len)
{
char *d = dest;
for ( ; len ; len--) {
*(d++) = (char)v;
}
return d;
}
#endif
static void load_programs(unsigned char *image, Elf64_Phdr *hdrs, int nhdr)
{
int i;
for (i = 0; i < nhdr; i++) {
if (hdrs[i].p_type == PT_LOAD) {
dprintf("PT_LOAD : %lx: %lx - %lx (%lx)\n",
hdrs[i].p_vaddr,
hdrs[i].p_offset, hdrs[i].p_filesz,
hdrs[i].p_memsz);
memcpy((void *)hdrs[i].p_vaddr,
image + hdrs[i].p_offset,
hdrs[i].p_filesz);
if (hdrs[i].p_filesz < hdrs[i].p_memsz) {
memset((void *)hdrs[i].p_vaddr +
hdrs[i].p_filesz, 0,
hdrs[i].p_memsz - hdrs[i].p_filesz);
}
}
}
}
/*
* Return value: If success, the entry point address. Otherwise, 0.
*/
unsigned long elfboot_main(unsigned char *image)
{
Elf64_Ehdr *hdr;
hdr = (Elf64_Ehdr *)image;
if (hdr->e_ident[0] != 0x7f || hdr->e_ident[1] != 'E'
|| hdr->e_ident[2] != 'L' || hdr->e_ident[3] != 'F') {
return 0;
}
/* TODO: We may overlap. So copying should be more sophisticated */
if (!hdr->e_phoff || hdr->e_phentsize != sizeof(Elf64_Phdr)) {
return 0;
}
load_programs(image,
(Elf64_Phdr *)(image + hdr->e_phoff), hdr->e_phnum);
return hdr->e_entry;
}

34
arch/x86_64/elfboot/head.S Normal file
View File

@@ -0,0 +1,34 @@
/**
* \file head.S
* License details are found in the file LICENSE.
* \brief
* Entry point calling to elfboot_main.
* \author Taku Shimosawa <shimosawa@is.s.u-tokyo.ac.jp> \par
* Copyright (C) 2011 - 2012 Taku Shimosawa
*/
/*
* HISTORY
*/
.text
.globl _start
_start:
leaq _stack_end(%rip), %rsp
/* preserve arguments */
pushq %rdi
pushq %rsi
pushq %rdx
pushq %rcx
leaq _stack_end(%rip), %rdi
call elfboot_main
andq %rax, %rax
jz 1f
popq %rcx
popq %rdx
popq %rsi
popq %rdi
jmpq *%rax
1:
cli
hlt
jmp 1b

37
arch/x86_64/elfboot/raw.lds Normal file
View File

@@ -0,0 +1,37 @@
ENTRY(_start)
PHDRS
{
text PT_LOAD;
data PT_LOAD;
}
SECTIONS
{
. = SIZEOF_HEADERS;
. = ALIGN(4096);
.text : {
*(.text)
} :text
.data : {
*(.data)
*(.data.*)
} :data
.rodata : {
*(.rodata .rodata.*)
} :data
. = ALIGN(8);
.bss : {
_bss_start = .;
*(.bss .bss.*)
_bss_end = .;
. = ALIGN(4096);
_stack_end = .;
} :data
/DISCARD/ : {
*(.eh_frame)
*(.note.gnu.build-id)
}
}

21
arch/x86_64/elfboot/test.h Normal file
View File

@@ -0,0 +1,21 @@
/**
* \file test.h
* License details are found in the file LICENSE.
* \brief
* Header file of test of loading an ELF image.
* \author Taku Shimosawa <shimosawa@is.s.u-tokyo.ac.jp> \par
* Copyright (C) 2011 - 2012 Taku Shimosawa
*/
/*
* HISTORY
*/
#ifdef TEST
#include <stdio.h>
#include <stdlib.h>
#define dprintf printf
#else
#define dprintf(...)
#endif

53
arch/x86_64/elfboot/test_main.c Normal file
View File

@@ -0,0 +1,53 @@
/**
* \file test_main.c
* License details are found in the file LICENSE.
* \brief
* Test of loading an ELF file.
* \author Taku Shimosawa <shimosawa@is.s.u-tokyo.ac.jp> \par
* Copyright (C) 2011 - 2012 Taku Shimosawa
*/
/*
* HISTORY
*/
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/stat.h>
#include <sys/mman.h>
unsigned long elfboot_main(unsigned char *image);
int main(int argc, char **argv)
{
int fd;
struct stat st;
void *p;
if (argc < 2) {
fprintf(stderr, "Usage : %s (elf)\n", argv[0]);
return 1;
}
fd = open(argv[1], O_RDONLY);
if (fd < 0){
perror("open");
return 1;
}
fstat(fd, &st);
p = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (p == MAP_FAILED) {
perror("mmap");
return 2;
}
printf("read result : %lx\n", elfboot_main(p));
munmap(p, st.st_size);
close(fd);
return 0;
}