From 8abff9252f9a9090ed7a81c19609bc978696a1f3 Mon Sep 17 00:00:00 2001 From: Philippe Vachon Date: Mon, 17 Nov 2008 02:59:53 -0500 Subject: [PATCH] Removed some stray debugging printfs. --- elf_loader.c | 10 +++++++--- main.c | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/elf_loader.c b/elf_loader.c index 83c8ce5..7a1f7f4 100644 --- a/elf_loader.c +++ b/elf_loader.c @@ -167,7 +167,7 @@ int load_elf32_file(uint32_t base, uint32_t loader_addr) #endif /* Jump to the copy routine */ - asm (".set noreorder\n" +/* asm (".set noreorder\n" "move $k0, %[bootcpy]\n" "move $a0, %[kdataoffset]\n" "move $a1, %[kdatalength]\n" @@ -175,12 +175,16 @@ int load_elf32_file(uint32_t base, uint32_t loader_addr) "move $a3, %[kloadoffset]\n" "jr $k0\n" " nop\n" - : /* no outputs */ + : : [bootcpy] "r"(loader_addr), [kdataoffset] "r"(load_offset), [kdatalength] "r"(mem_sz), [kentrypt]"r"(hdr.entry), [kloadoffset] "r"(hdr.entry) : "k0", "a0", "a1", "a2", "a3" - ); + ); */ + + ((void (*)(uint32_t data_offset, uint32_t data_length, uint32_t entry_pt, + uint32_t load_offset)) (loader_addr)) + (load_offset, mem_sz, hdr.entry, hdr.entry); return -1; /* something failed, badly */ } diff --git a/main.c b/main.c index 478a33d..61ea57f 100644 --- a/main.c +++ b/main.c @@ -175,12 +175,9 @@ enter_filename: const char *cmd_line_append; if ((cmd_line_append = strchr(buf, ' ')) != NULL) { strcpy(cmd_line, (char *)(cmd_line_append + 1)); - printf("DEBUG: Command line: [%s]\n"); /* extract the kernel file name now */ uint32_t kernel_name_len = cmd_line_append - buf; - printf("DEBUG: kernel name is %d bytes long\n", kernel_name_len); strncpy(kernel, buf, kernel_name_len); - printf("DEBUG: kernel name is %s\n", kernel); kernel[kernel_name_len + 1] = '\0'; } else { cmd_line[0] = '\0';