This commit is contained in:
rsc 2007-08-08 08:50:23 +00:00
parent e695b849af
commit e0924827ee
2 changed files with 25 additions and 4 deletions

View file

@ -84,9 +84,9 @@ _init : init.o $(ULIB)
$(OBJDUMP) -S _init > init.asm $(OBJDUMP) -S _init > init.asm
$(OBJDUMP) -t _init | awk '/SYMBOL TABLE/ { go=1; next } go {print $$1, $$NF}' >init.sym $(OBJDUMP) -t _init | awk '/SYMBOL TABLE/ { go=1; next } go {print $$1, $$NF}' >init.sym
_sh : sh.o $(ULIB) _kill : kill.o $(ULIB)
$(LD) -N -e main -Ttext 0 -o _sh sh.o $(ULIB) $(LD) -N -e main -Ttext 0 -o _kill kill.o $(ULIB)
$(OBJDUMP) -S _sh > sh.asm $(OBJDUMP) -S _kill > kill.asm
_ls : ls.o $(ULIB) _ls : ls.o $(ULIB)
$(LD) -N -e main -Ttext 0 -o _ls ls.o $(ULIB) $(LD) -N -e main -Ttext 0 -o _ls ls.o $(ULIB)
@ -100,6 +100,10 @@ _rm : rm.o $(ULIB)
$(LD) -N -e main -Ttext 0 -o _rm rm.o $(ULIB) $(LD) -N -e main -Ttext 0 -o _rm rm.o $(ULIB)
$(OBJDUMP) -S _rm > rm.asm $(OBJDUMP) -S _rm > rm.asm
_sh : sh.o $(ULIB)
$(LD) -N -e main -Ttext 0 -o _sh sh.o $(ULIB)
$(OBJDUMP) -S _sh > sh.asm
_zombie: zombie.o $(ULIB) _zombie: zombie.o $(ULIB)
$(LD) -N -e main -Ttext 0 -o _zombie zombie.o $(ULIB) $(LD) -N -e main -Ttext 0 -o _zombie zombie.o $(ULIB)
$(OBJDUMP) -S _zombie > zombie.asm $(OBJDUMP) -S _zombie > zombie.asm
@ -107,7 +111,7 @@ _zombie: zombie.o $(ULIB)
mkfs : mkfs.c fs.h mkfs : mkfs.c fs.h
cc -o mkfs mkfs.c cc -o mkfs mkfs.c
UPROGS=usertests _echo _cat _init _sh _ls _mkdir _rm _zombie UPROGS=usertests _echo _cat _init _kill _ls _mkdir _rm _sh _zombie
fs.img : mkfs README $(UPROGS) fs.img : mkfs README $(UPROGS)
./mkfs fs.img README $(UPROGS) ./mkfs fs.img README $(UPROGS)

17
kill.c Normal file
View file

@ -0,0 +1,17 @@
#include "types.h"
#include "stat.h"
#include "user.h"
int
main(int argc, char **argv)
{
int i;
if(argc < 1){
printf(2, "usage: kill pid...\n");
exit();
}
for(i=1; i<argc; i++)
kill(atoi(argv[i]));
exit();
}