ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Rename main0 to main.

Browse source
This commit is contained in:
rsc 2007-08-27 23:32:16 +00:00
parent 558ab49f13
commit 19b42cc078
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -60,7 +60,7 @@ kernel : $(OBJS) bootother.S initcode.S
$(LD) -N -e start -Ttext 0 -o initcode.out initcode.o $(LD) -N -e start -Ttext 0 -o initcode.out initcode.o
$(OBJCOPY) -S -O binary initcode.out initcode $(OBJCOPY) -S -O binary initcode.out initcode
$(OBJDUMP) -S initcode.o > initcode.asm $(OBJDUMP) -S initcode.o > initcode.asm
$(LD) -Ttext 0x100000 -e main0 -o kernel $(OBJS) -b binary initcode bootother $(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) -b binary initcode bootother
$(OBJDUMP) -S kernel > kernel.asm $(OBJDUMP) -S kernel > kernel.asm
$(OBJDUMP) -t kernel | awk '/SYMBOL TABLE/ { go=1; next } go {print $$1, $$NF}' >kernel.sym $(OBJDUMP) -t kernel | awk '/SYMBOL TABLE/ { go=1; next } go {print $$1, $$NF}' >kernel.sym

2
defs.h
View file

@ -102,7 +102,7 @@ void proc_exit(void);
int proc_kill(int); int proc_kill(int);
int proc_wait(void); int proc_wait(void);
void procdump(void); void procdump(void);
void scheduler(void); void scheduler(void) __attribute__((noreturn));
void setupsegs(struct proc*); void setupsegs(struct proc*);
void sleep(void*, struct spinlock*); void sleep(void*, struct spinlock*);
void userinit(void); void userinit(void);

1
initcode.S
View file

@ -4,6 +4,7 @@
#include "traps.h" #include "traps.h"
# exec(init, argv) # exec(init, argv)
.globl start
start: start:
pushl $argv pushl $argv
pushl $init pushl $init

4
main.c
View file

@ -10,8 +10,8 @@ extern char edata[], end[];
void bootothers(void); void bootothers(void);
// Bootstrap processor starts running C code here. // Bootstrap processor starts running C code here.
void int
main0(void) main(void)
{ {
int i; int i;
static volatile int bcpu; // cannot be on stack static volatile int bcpu; // cannot be on stack