Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2988 → Rev 2987

/branches/dynload/uspace/app/iloader/arch/ppc32/include/pcb.h
File deleted
/branches/dynload/uspace/app/iloader/arch/mips32/include/pcb.h
File deleted
/branches/dynload/uspace/app/iloader/arch/ia32/include/pcb.h
File deleted
/branches/dynload/uspace/app/iloader/include/pcb.h
33,7 → 33,7
#ifndef ILOADER_PCB_H_
#define ILOADER_PCB_H_
 
#include <arch/pcb.h>
#define PCB_ADDRESS 0x6000000
 
typedef void (*entry_point_t)(void);
 
/branches/dynload/uspace/app/iloader/main.c
57,8 → 57,7
 
printf("Load program\n");
 
// rc = elf_load_file("/dltest", 0, &prog_info);
rc = elf_load_file("/tetris", 0, &prog_info);
rc = elf_load_file("/dltest", 0, &prog_info);
if (rc < 0) {
printf("failed to load program\n");
return 1;
67,11 → 66,9
printf("Create PCB\n");
if (elf_create_pcb(&prog_info) < 0) return 1;
 
// elf_run(&prog_info);
 
// getchar();
 
/* printf("Load dynamic linker\n");
printf("Load dynamic linker\n");
file_name = "/rtld.so";
printf("open and read '%s'...\n", file_name);
rc = elf_load_file(file_name, RTLD_BIAS, &interp_info);
82,7 → 79,7
 
printf("run dynamic linker\n");
elf_run(&interp_info);
*/
 
/* not reached */
return 0;
}
/branches/dynload/uspace/app/iloader/Makefile
60,17 → 60,14
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
.PHONY: all clean depend disasm inc
.PHONY: all clean depend disasm
 
all: inc $(OUTPUT) disasm
all: $(OUTPUT) disasm
 
inc:
ln -sfn ../arch/$(ARCH)/include include/arch
 
-include Makefile.depend
 
clean:
-rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(ARCH)/_link.ld Makefile.depend include/arch
-rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(ARCH)/_link.ld Makefile.depend
 
depend:
$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend