aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/chess/Makefile3
-rw-r--r--apps/idle/Makefile3
-rw-r--r--apps/init/Makefile3
-rw-r--r--apps/init/init.c4
-rw-r--r--apps/test/Makefile3
-rw-r--r--apps/wm/Makefile3
-rw-r--r--boot/load.c2
-rw-r--r--kernel/Makefile4
-rw-r--r--kernel/drivers/cpu.c2
-rw-r--r--kernel/features/fs.c4
-rw-r--r--kernel/features/load.c20
-rw-r--r--kernel/features/proc.c4
-rw-r--r--kernel/inc/load.h2
-rw-r--r--kernel/inc/proc.h3
-rw-r--r--libs/libgui/gfx.h2
-rw-r--r--libs/libgui/gui.c2
-rwxr-xr-xrun6
17 files changed, 40 insertions, 30 deletions
diff --git a/apps/chess/Makefile b/apps/chess/Makefile
index b22cb1a..549b603 100644
--- a/apps/chess/Makefile
+++ b/apps/chess/Makefile
@@ -3,7 +3,8 @@
OBJS = chess.o
all: $(OBJS)
- @$(LD) -o $(BUILD)/apps/chess $(LDFLAGS) $< -lgui -ltxt -lc
+ @mkdir -p $(BUILD)/apps/chess/
+ @$(LD) -o $(BUILD)/apps/chess/exec $(LDFLAGS) $< -lgui -ltxt -lc
clean:
@$(RM) -f $(OBJS)
diff --git a/apps/idle/Makefile b/apps/idle/Makefile
index 3060ae3..dc979b3 100644
--- a/apps/idle/Makefile
+++ b/apps/idle/Makefile
@@ -3,7 +3,8 @@
OBJS = idle.o
all: $(OBJS)
- @$(LD) -o $(BUILD)/apps/idle $(LDFLAGS) $< -lc
+ @mkdir -p $(BUILD)/apps/idle/
+ @$(LD) -o $(BUILD)/apps/idle/exec $(LDFLAGS) $< -lc
clean:
@$(RM) -f $(OBJS)
diff --git a/apps/init/Makefile b/apps/init/Makefile
index 7dec3e8..b56c344 100644
--- a/apps/init/Makefile
+++ b/apps/init/Makefile
@@ -3,7 +3,8 @@
OBJS = init.o
all: $(OBJS)
- @$(LD) -o $(BUILD)/apps/init $(LDFLAGS) $< -lc
+ @mkdir -p $(BUILD)/apps/init/
+ @$(LD) -o $(BUILD)/apps/init/exec $(LDFLAGS) $< -lc
clean:
@$(RM) -f $(OBJS)
diff --git a/apps/init/init.c b/apps/init/init.c
index a7d07df..6e06dbe 100644
--- a/apps/init/init.c
+++ b/apps/init/init.c
@@ -9,8 +9,8 @@ int main(int argc, char **argv)
UNUSED(argc);
UNUSED(argv);
- assert(exec("/bin/wm", "wm", NULL) == EOK);
- /* assert(exec("/bin/chess", "chess", NULL) == EOK); */
+ assert(exec("wm", NULL) == EOK);
+ /* assert(exec("chess", NULL) == EOK); */
return 0;
}
diff --git a/apps/test/Makefile b/apps/test/Makefile
index 7959154..cbd3b57 100644
--- a/apps/test/Makefile
+++ b/apps/test/Makefile
@@ -3,7 +3,8 @@
OBJS = test.o
all: $(OBJS)
- @$(LD) -o $(BUILD)/apps/test $(LDFLAGS) $< -lc
+ @mkdir -p $(BUILD)/apps/test/
+ @$(LD) -o $(BUILD)/apps/test/exec $(LDFLAGS) $< -lc
clean:
@$(RM) -f $(OBJS)
diff --git a/apps/wm/Makefile b/apps/wm/Makefile
index 66f68f6..48ed1d3 100644
--- a/apps/wm/Makefile
+++ b/apps/wm/Makefile
@@ -3,7 +3,8 @@
OBJS = wm.o
all: $(OBJS)
- @$(LD) -o $(BUILD)/apps/wm $(LDFLAGS) $< -lgui -ltxt -lc
+ @mkdir -p $(BUILD)/apps/wm/
+ @$(LD) -o $(BUILD)/apps/wm/exec $(LDFLAGS) $< -lgui -ltxt -lc
clean:
@$(RM) -f $(OBJS)
diff --git a/boot/load.c b/boot/load.c
index a3566f4..12102a2 100644
--- a/boot/load.c
+++ b/boot/load.c
@@ -893,7 +893,7 @@ int main(void *first, void *second)
u8 drive = ata_probe();
assert(drive);
- s32 elf = elf_load("/bin/kernel", drive);
+ s32 elf = elf_load("/apps/kernel/exec", drive);
assert(elf > 0);
void (*kernel)(void *, void *);
diff --git a/kernel/Makefile b/kernel/Makefile
index 1c37168..e28d2d8 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -31,5 +31,5 @@ all: compile
@$(AS) $(ASFLAGS) $< -o $@
compile: $(COBJS)
- @mkdir -p $(BUILD)/apps/
- @$(LD) -N -z max-page-size=0x1000 -ekernel_main -Tlink.ld -o $(BUILD)/apps/kernel -L$(BUILD) $+ -lk
+ @mkdir -p $(BUILD)/apps/kernel/
+ @$(LD) -N -z max-page-size=0x1000 -ekernel_main -Tlink.ld -o $(BUILD)/apps/kernel/exec -L$(BUILD) $+ -lk
diff --git a/kernel/drivers/cpu.c b/kernel/drivers/cpu.c
index 86ae2be..f751d33 100644
--- a/kernel/drivers/cpu.c
+++ b/kernel/drivers/cpu.c
@@ -145,7 +145,7 @@ CLEAR void cpu_enable_features(void)
panic("No FPU support!\n");
}
- // Enable NX (IA32_EFER.NXE)
+ // Enable NX (IA32_EFER.NXE) // TODO: Use NX Bit? (only possible in PAE 64 bit paging?)
if (cpu_extended_information.edx & CPUID_EXT_INFO_EDX_NX) {
__asm__ volatile("movl $0xc0000080, %ecx\n"
"rdmsr\n"
diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index 47e7891..b5bb2a4 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -565,7 +565,7 @@ static res read_inode(struct ext2_inode *in, void *buf, u32 offset, u32 count, s
static u32 find_inode(const char *name, u32 dir_inode, struct device *dev)
{
- if (!dir_inode)
+ if ((signed)dir_inode <= 0)
return (unsigned)-1;
struct ext2_inode i = { 0 };
@@ -624,7 +624,7 @@ static struct ext2_inode *find_inode_by_path(const char *path, struct ext2_inode
current_inode = find_inode(path_cp, current_inode, dev);
path_cp[i] = '/';
- if (current_inode == 0) {
+ if ((signed)current_inode <= 0) {
free(init);
return NULL;
}
diff --git a/kernel/features/load.c b/kernel/features/load.c
index d87bb94..91954b1 100644
--- a/kernel/features/load.c
+++ b/kernel/features/load.c
@@ -9,11 +9,19 @@
#include <random.h>
#include <str.h>
-res elf_load(const char *path, struct proc *proc)
+res elf_load(const char *name, struct proc *proc)
{
- if (!memory_valid(path))
+ if (!memory_valid(name))
return -EFAULT;
+ stac();
+ char path[64] = { "/apps/" };
+ strlcat(path, name, sizeof(path));
+ strlcpy(proc->dir, path, sizeof(proc->dir));
+ strlcat(path, "/exec", sizeof(path));
+ strlcpy(proc->name, name, sizeof(proc->name));
+ clac();
+
struct stat s = { 0 };
memory_bypass_enable();
res stat = vfs_stat(path, &s);
@@ -32,10 +40,6 @@ res elf_load(const char *path, struct proc *proc)
if (read != sizeof(header))
return -ENOEXEC;
- stac();
- strlcpy(proc->name, path, sizeof(proc->name));
- clac();
-
// Valid?
u8 *magic = header.ident;
u8 valid_magic = magic[ELF_IDENT_MAG0] == ELF_MAG0 && magic[ELF_IDENT_MAG1] == ELF_MAG1 &&
@@ -86,8 +90,8 @@ res elf_load(const char *path, struct proc *proc)
virtual_map(proc->page_dir, prange, vrange.base, MEMORY_CLEAR | MEMORY_USER);
memory_bypass_enable();
- if ((u32)vfs_read(proc->name, (void *)((u32)program.vaddr + rand_off),
- program.offset, program.filesz) != program.filesz) {
+ if ((u32)vfs_read(path, (void *)((u32)program.vaddr + rand_off), program.offset,
+ program.filesz) != program.filesz) {
memory_bypass_disable();
memory_switch_dir(prev);
return -ENOEXEC;
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index f547193..479427c 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -559,7 +559,7 @@ NORETURN void proc_init(void)
// Idle proc
// TODO: Reimplement hlt privileges in idle proc (SMEP!)
struct proc *kernel_proc = proc_make(PROC_PRIV_NONE);
- assert(elf_load("/bin/idle", kernel_proc) == EOK);
+ assert(elf_load("idle", kernel_proc) == EOK);
proc_stack_push(kernel_proc, 0);
proc_stack_push(kernel_proc, 0);
kernel_proc->state = PROC_BLOCKED;
@@ -570,7 +570,7 @@ NORETURN void proc_init(void)
// Init proc (root)
struct proc *init = proc_make(PROC_PRIV_ROOT);
- assert(elf_load("/bin/init", init) == EOK);
+ assert(elf_load("init", init) == EOK);
proc_stack_push(init, 0);
proc_stack_push(init, 0);
current = list_first_data(proc_list_running, init);
diff --git a/kernel/inc/load.h b/kernel/inc/load.h
index af59cce..9e62369 100644
--- a/kernel/inc/load.h
+++ b/kernel/inc/load.h
@@ -161,6 +161,6 @@ struct PACKED elf_symbol {
u16 shndx;
};
-res elf_load(const char *path, struct proc *proc) NONNULL;
+res elf_load(const char *name, struct proc *proc) NONNULL;
#endif
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index d20a1b0..dcc2eeb 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -53,7 +53,8 @@ struct stream {
struct proc {
u32 pid;
u32 entry;
- char name[32];
+ char name[64];
+ char dir[64];
struct stream streams[4];
struct page_dir *page_dir;
struct regs regs;
diff --git a/libs/libgui/gfx.h b/libs/libgui/gfx.h
index 082fe07..f01a6a2 100644
--- a/libs/libgui/gfx.h
+++ b/libs/libgui/gfx.h
@@ -9,7 +9,7 @@
#include <sys.h>
#include <vec.h>
-#define WM_PATH "/bin/wm"
+#define WM_PATH "wm"
#define GET_ALPHA(color) ((color >> 24) & 0x000000FF)
#define GET_RED(color) ((color >> 16) & 0x000000FF)
diff --git a/libs/libgui/gui.c b/libs/libgui/gui.c
index e8291f5..4e3b4cb 100644
--- a/libs/libgui/gui.c
+++ b/libs/libgui/gui.c
@@ -8,7 +8,7 @@
#include <list.h>
#include <print.h>
-#define WM_PATH "/bin/wm"
+#define WM_PATH "wm"
struct gui_widget {
u32 id;
diff --git a/run b/run
index af67dbc..a232762 100755
--- a/run
+++ b/run
@@ -178,7 +178,7 @@ make_build() {
fi
$SUDO cp -r disk/* mnt/
$SUDO chmod -R 0 mnt/conf/
- $SUDO cp -r build/apps/ mnt/bin/
+ $SUDO cp -r build/apps/ mnt/apps/
$SUDO cp build/load.bin mnt/
$SUDO umount mnt/
rm -rf mnt/
@@ -210,7 +210,7 @@ make_disasm() {
echo "Usage: './run disasm {kernel, wm, ...} [-S]'"
exit 1
fi
- objdump -drwC "$2" -Mintel build/apps/"$1" | less -R
+ objdump -drwC "$2" -Mintel build/apps/"$1"/exec | less -R
#hexdump -C build/kernel.bin | less -R
}
@@ -220,7 +220,7 @@ make_addr() {
echo "Usage: './run addr kernel 0x50042'"
exit 1
fi
- addr2line -e build/apps/"$1" -f -p "$2"
+ addr2line -e build/apps/"$1"/exec -f -p "$2"
}
make_cloc() {