Skip to content

X
xv6-public
提交 9e9bcaf1 创建 作者: rsc's avatar rsc
浏览文件
操作

standardize various * conventions

上级 03b6376f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 417 行增加 和 417 行删除
bio.c
浏览文件 @ 9e9bcaf1
......@@ -32,7 +32,7 @@ binit(void)
}
}
struct buf *
struct buf*
getblk(uint dev, uint sector)
{
struct buf *b;
......@@ -67,7 +67,7 @@ getblk(uint dev, uint sector)
}
}
struct buf *
struct buf*
bread(uint dev, uint sector)
{
void *c;
......@@ -80,7 +80,7 @@ bread(uint dev, uint sector)
acquire(&ide_lock);
c = ide_start_rw(dev & 0xff, sector, b->data, 1, 1);
sleep (c, &ide_lock);
sleep(c, &ide_lock);
ide_finish(c);
b->flags |= B_VALID;
release(&ide_lock);
......@@ -96,7 +96,7 @@ bwrite(struct buf *b, uint sector)
acquire(&ide_lock);
c = ide_start_rw(b->dev & 0xff, sector, b->data, 1, 0);
sleep (c, &ide_lock);
sleep(c, &ide_lock);
ide_finish(c);
b->flags |= B_VALID;
release(&ide_lock);
......@@ -107,7 +107,7 @@ brelse(struct buf *b)
{
if((b->flags & B_BUSY) == 0)
panic("brelse");
acquire(&buf_table_lock);
b->next->prev = b->prev;
......
bootasm.S
浏览文件 @ 9e9bcaf1
#include "asm.h"
.set PROT_MODE_CSEG,0x8 # code segment selector
.set PROT_MODE_DSEG,0x10 # data segment selector
.set CR0_PE_ON,0x1 # protected mode enable flag
###################################################################################
# ENTRY POINT
# ENTRY POINT
# This code should be stored in the first sector of the hard disk.
# After the BIOS initializes the hardware on startup or system reset,
# it loads this code at physical address 0x7c00 - 0x7d00 (512 bytes).
# Then the BIOS jumps to the beginning of it, address 0x7c00,
# while running in 16-bit real-mode (8086 compatibility mode).
# The Code Segment register (CS) is initially zero on entry.
#
#
# This code switches into 32-bit protected mode so that all of
# memory can accessed, then calls into C.
###################################################################################
.globl start # Entry point
.globl start # Entry point
start:
.code16 # This runs in real mode
cli # Disable interrupts
......@@ -31,7 +31,7 @@ start:
# Set up the stack pointer, growing downward from 0x7c00.
movw $start,%sp # Stack Pointer
#### Enable A20:
#### For fascinating historical reasons (related to the fact that
#### the earliest 8086-based PCs could only address 1MB of physical memory
......@@ -39,7 +39,7 @@ start:
#### physical address line 20 is tied to low when the machine boots.
#### Obviously this a bit of a drag for us, especially when trying to
#### address memory above 1MB. This code undoes this.
seta20.1:
inb $0x64,%al # Get status
testb $0x2,%al # Busy?
......@@ -54,7 +54,7 @@ seta20.2:
movb $0xdf,%al # Enable
outb %al,$0x60 # A20
#### Switch from real to protected mode
#### Switch from real to protected mode
#### The descriptors in our GDT allow all physical memory to be accessed.
#### Furthermore, the descriptors have base addresses of 0, so that the
#### segment translation is a NOP, ie. virtual addresses are identical to
......@@ -63,21 +63,21 @@ seta20.2:
#### that it is running directly on physical memory with no translation.
#### This initial NOP-translation setup is required by the processor
#### to ensure that the transition to protected mode occurs smoothly.
real_to_prot:
cli # Mandatory since we dont set up an IDT
lgdt gdtdesc # load GDT -- mandatory in protected mode
movl %cr0, %eax # turn on protected mode
orl $CR0_PE_ON, %eax #
movl %eax, %cr0 #
orl $CR0_PE_ON, %eax #
movl %eax, %cr0 #
### CPU magic: jump to relocation, flush prefetch queue, and reload %cs
### Has the effect of just jmp to the next instruction, but simultaneous
### loads CS with $PROT_MODE_CSEG.
ljmp $PROT_MODE_CSEG, $protcseg
#### we are in 32-bit protected mode (hence the .code32)
.code32
protcseg:
protcseg:
# Set up the protected-mode data segment registers
movw $PROT_MODE_DSEG, %ax # Our data segment selector
movw %ax, %ds # -> DS: Data Segment
......@@ -97,7 +97,7 @@ gdt:
SEG_NULLASM # null seg
SEG_ASM(STA_X|STA_R, 0x0, 0xffffffff) # code seg
SEG_ASM(STA_W, 0x0, 0xffffffff) # data seg
gdtdesc:
.word 0x17 # sizeof(gdt) - 1
.long gdt # address gdt
bootmain.c
浏览文件 @ 9e9bcaf1
......@@ -9,16 +9,16 @@
* DISK LAYOUT
* * This program(boot.S and main.c) is the bootloader. It should
* be stored in the first sector of the disk.
*
*
* * The 2nd sector onward holds the kernel image.
*
*
* * The kernel image must be in ELF format.
*
* BOOT UP STEPS
* BOOT UP STEPS
* * when the CPU boots it loads the BIOS into memory and executes it
*
* * the BIOS intializes devices, sets of the interrupt routines, and
* reads the first sector of the boot device(e.g., hard-drive)
* reads the first sector of the boot device(e.g., hard-drive)
* into memory and jumps to it.
*
* * Assuming this boot loader is stored in the first sector of the
......@@ -31,7 +31,7 @@
**********************************************************************/
#define SECTSIZE 512
#define ELFHDR ((struct elfhdr *) 0x10000) // scratch space
#define ELFHDR ((struct elfhdr*) 0x10000) // scratch space
void readsect(void*, uint);
void readseg(uint, uint, uint);
......@@ -45,18 +45,18 @@ cmain(void)
readseg((uint) ELFHDR, SECTSIZE*8, 0);
// is this a valid ELF?
if (ELFHDR->magic != ELF_MAGIC)
if(ELFHDR->magic != ELF_MAGIC)
goto bad;
// load each program segment (ignores ph flags)
ph = (struct proghdr *) ((uchar *) ELFHDR + ELFHDR->phoff);
ph = (struct proghdr*) ((uchar*) ELFHDR + ELFHDR->phoff);
eph = ph + ELFHDR->phnum;
for (; ph < eph; ph++)
for(; ph < eph; ph++)
readseg(ph->va, ph->memsz, ph->offset);
// call the entry point from the ELF header
// note: does not return!
((void (*)(void)) (ELFHDR->entry & 0xFFFFFF))();
((void(*)(void)) (ELFHDR->entry & 0xFFFFFF))();
bad:
outw(0x8A00, 0x8A00);
......@@ -74,7 +74,7 @@ readseg(uint va, uint count, uint offset)
va &= 0xFFFFFF;
end_va = va + count;
// round down to sector boundary
va &= ~(SECTSIZE - 1);
......@@ -84,7 +84,7 @@ readseg(uint va, uint count, uint offset)
// If this is too slow, we could read lots of sectors at a time.
// We'd write more to memory than asked, but it doesn't matter --
// we load in increasing order.
while (va < end_va) {
while(va < end_va) {
readsect((uchar*) va, offset);
va += SECTSIZE;
offset++;
......@@ -95,7 +95,7 @@ void
waitdisk(void)
{
// wait for disk reaady
while ((inb(0x1F7) & 0xC0) != 0x40)
while((inb(0x1F7) & 0xC0) != 0x40)
/* do nothing */;
}
......
bootother.S
浏览文件 @ 9e9bcaf1
#include "asm.h"
/*
* Start an Application Processor. This must be placed on a 4KB boundary
* somewhere in the 1st MB of conventional memory (APBOOTSTRAP). However,
......@@ -13,7 +13,7 @@
* mp.c causes each non-boot CPU in turn to jump to start.
* mp.c puts the correct %esp in start-4, and the place to jump
* to in start-8.
*
*
*/
.set PROT_MODE_CSEG,0x8 # code segment selector
......@@ -34,8 +34,8 @@ start:
# Set up the stack pointer, growing downward from 0x7000-8.
movw $start-8,%sp # Stack Pointer
#### Switch from real to protected mode
#### Switch from real to protected mode
#### The descriptors in our GDT allow all physical memory to be accessed.
#### Furthermore, the descriptors have base addresses of 0, so that the
#### segment translation is a NOP, ie. virtual addresses are identical to
......@@ -44,11 +44,11 @@ start:
#### that it is running directly on physical memory with no translation.
#### This initial NOP-translation setup is required by the processor
#### to ensure that the transition to protected mode occurs smoothly.
lgdt gdtdesc # load GDT -- mandatory in protected mode
movl %cr0, %eax # turn on protected mode
orl $CR0_PE_ON, %eax #
movl %eax, %cr0 #
orl $CR0_PE_ON, %eax #
movl %eax, %cr0 #
### CPU magic: jump to relocation, flush prefetch queue, and reload %cs
### Has the effect of just jmp to the next instruction, but simultaneous
### loads CS with $PROT_MODE_CSEG.
......@@ -56,7 +56,7 @@ start:
#### we are in 32-bit protected mode (hence the .code32)
.code32
protcseg:
protcseg:
# Set up the protected-mode data segment registers
movw $PROT_MODE_DSEG, %ax # Our data segment selector
movw %ax, %ds # -> DS: Data Segment
......@@ -67,14 +67,14 @@ protcseg:
movl start-8, %eax
movl start-4, %esp
jmp *%eax
jmp *%eax
.p2align 2 # force 4 byte alignment
gdt:
SEG_NULLASM # null seg
SEG_ASM(STA_X|STA_R, 0x0, 0xffffffff) # code seg
SEG_ASM(STA_W, 0x0, 0xffffffff) # data seg
gdtdesc:
.word 0x17 # sizeof(gdt) - 1
.long gdt # address gdt
cat.c
浏览文件 @ 9e9bcaf1
......@@ -24,7 +24,7 @@ main(int argc, char *argv[])
{
int fd, i;
if (argc <= 1) {
if(argc <= 1) {
rfile(0);
} else {
for(i = 1; i < argc; i++){
......
console.c
浏览文件 @ 9e9bcaf1
......@@ -20,7 +20,7 @@ lpt_putc(int c)
{
int i;
for (i = 0; !(inb(0x378+1) & 0x80) && i < 12800; i++)
for(i = 0; !(inb(0x378+1) & 0x80) && i < 12800; i++)
;
outb(0x378+0, c);
outb(0x378+2, 0x08|0x04|0x01);
......@@ -31,7 +31,7 @@ static void
cons_putc(int c)
{
int crtport = 0x3d4; // io port of CGA
ushort *crt = (ushort *) 0xB8000; // base of CGA memory
ushort *crt = (ushort*) 0xB8000; // base of CGA memory
int ind;
if(panicked){
......@@ -79,7 +79,7 @@ printint(int xx, int base, int sgn)
char digits[] = "0123456789ABCDEF";
int i = 0, neg = 0;
uint x;
if(sgn && xx < 0){
neg = 1;
x = 0 - xx;
......@@ -104,7 +104,7 @@ void
cprintf(char *fmt, ...)
{
int i, state = 0, c, locking = 0;
uint *ap = (uint *)(void*)&fmt + 1;
uint *ap = (uint*)(void*)&fmt + 1;
if(use_console_lock){
locking = 1;
......@@ -166,13 +166,13 @@ panic(char *s)
}
int
console_write (int minor, char *buf, int n)
console_write(int minor, char *buf, int n)
{
int i;
acquire(&console_lock);
for (i = 0; i < n; i++) {
for(i = 0; i < n; i++) {
cons_putc(buf[i] & 0xff);
}
......@@ -211,7 +211,7 @@ console_write (int minor, char *buf, int n)
#define KEY_INS 0xE8
#define KEY_DEL 0xE9
static uchar shiftcode[256] =
static uchar shiftcode[256] =
{
[0x1D] CTL,
[0x2A] SHIFT,
......@@ -221,7 +221,7 @@ static uchar shiftcode[256] =
[0xB8] ALT
};
static uchar togglecode[256] =
static uchar togglecode[256] =
{
[0x3A] CAPSLOCK,
[0x45] NUMLOCK,
......@@ -249,7 +249,7 @@ static uchar normalmap[256] =
[0xD2] KEY_INS, [0xD3] KEY_DEL
};
static uchar shiftmap[256] =
static uchar shiftmap[256] =
{
NO, 033, '!', '@', '#', '$', '%', '^', // 0x00
'&', '*', '(', ')', '_', '+', '\b', '\t',
......@@ -272,13 +272,13 @@ static uchar shiftmap[256] =
#define C(x) (x - '@')
static uchar ctlmap[256] =
static uchar ctlmap[256] =
{
NO, NO, NO, NO, NO, NO, NO, NO,
NO, NO, NO, NO, NO, NO, NO, NO,
NO, NO, NO, NO, NO, NO, NO, NO,
NO, NO, NO, NO, NO, NO, NO, NO,
C('Q'), C('W'), C('E'), C('R'), C('T'), C('Y'), C('U'), C('I'),
C('O'), C('P'), NO, NO, '\r', NO, C('A'), C('S'),
C('D'), C('F'), C('G'), C('H'), C('J'), C('K'), C('L'), NO,
C('D'), C('F'), C('G'), C('H'), C('J'), C('K'), C('L'), NO,
NO, NO, NO, C('\\'), C('Z'), C('X'), C('C'), C('V'),
C('B'), C('N'), C('M'), NO, NO, C('/'), NO, NO,
[0x97] KEY_HOME,
......@@ -311,41 +311,41 @@ kbd_intr()
acquire(&kbd_lock);
st = inb(KBSTATP);
if ((st & KBS_DIB) == 0){
if((st & KBS_DIB) == 0){
release(&kbd_lock);
return;
}
data = inb(KBDATAP);
if (data == 0xE0) {
if(data == 0xE0) {
shift |= E0ESC;
release(&kbd_lock);
return;
} else if (data & 0x80) {
} else if(data & 0x80) {
// Key released
data = (shift & E0ESC ? data : data & 0x7F);
shift &= ~(shiftcode[data] | E0ESC);
release(&kbd_lock);
return;
} else if (shift & E0ESC) {
} else if(shift & E0ESC) {
// Last character was an E0 escape; or with 0x80
data |= 0x80;
shift &= ~E0ESC;
}
shift |= shiftcode[data];
shift ^= togglecode[data];
c = charcode[shift & (CTL | SHIFT)][data];
if (shift & CAPSLOCK) {
if ('a' <= c && c <= 'z')
if(shift & CAPSLOCK) {
if('a' <= c && c <= 'z')
c += 'A' - 'a';
else if ('A' <= c && c <= 'Z')
else if('A' <= c && c <= 'Z')
c += 'a' - 'A';
}
// xxx hack
if (c == 0x0) {
if(c == 0x0) {
release(&kbd_lock);
return;
}
......@@ -397,7 +397,7 @@ console_init()
devsw[CONSOLE].d_write = console_write;
devsw[CONSOLE].d_read = console_read;
ioapic_enable (IRQ_KBD, 0);
ioapic_enable(IRQ_KBD, 0);
use_console_lock = 1;
}
defs.h
浏览文件 @ 9e9bcaf1
// kalloc.c
char *kalloc(int);
char* kalloc(int);
void kfree(char*, int);
void kinit(void);
......@@ -18,7 +18,7 @@ struct proc* copyproc(struct proc*);
struct spinlock;
uint growproc(int);
void sleep(void*, struct spinlock*);
void wakeup(void *);
void wakeup(void*);
void scheduler(void);
void proc_exit(void);
int proc_kill(int);
......@@ -35,9 +35,9 @@ void tvinit(void);
void idtinit(void);
// string.c
void * memset(void*, int, uint);
void* memset(void*, int, uint);
int memcmp(const void*, const void*, uint);
void *memmove(void*, const void*, uint);
void* memmove(void*, const void*, uint);
int strncmp(const char*, const char*, uint);
// syscall.c
......
dev.h
浏览文件 @ 9e9bcaf1
struct devsw {
int (*d_open)(char *, int);
int (*d_read)(int, char *, int);
int (*d_write)(int, char *, int);
int (*d_open)(char*, int);
int (*d_read)(int, char*, int);
int (*d_write)(int, char*, int);
int (*d_close)(int);
};
......
fd.c
浏览文件 @ 9e9bcaf1
......@@ -39,7 +39,7 @@ fd_ualloc(void)
/*
* allocate a file descriptor structure
*/
struct fd *
struct fd*
fd_alloc(void)
{
int i;
......@@ -67,10 +67,10 @@ fd_write(struct fd *fd, char *addr, int n)
return -1;
if(fd->type == FD_PIPE){
return pipe_write(fd->pipe, addr, n);
} else if (fd->type == FD_FILE) {
} else if(fd->type == FD_FILE) {
ilock(fd->ip);
int r = writei (fd->ip, addr, fd->off, n);
if (r > 0) {
int r = writei(fd->ip, addr, fd->off, n);
if(r > 0) {
fd->off += r;
}
iunlock(fd->ip);
......
fs.c
浏览文件 @ 9e9bcaf1
差异被折叠。
fstests.c
浏览文件 @ 9e9bcaf1
......@@ -151,7 +151,7 @@ createdelete()
if(pid)
exit();
else
else
exit();
for(i = 0; i < n; i++){
......@@ -198,7 +198,7 @@ void
unlinkread()
{
int fd, fd1;
fd = open("unlinkread", O_CREATE | O_RDWR);
if(fd < 0){
puts("create unlinkread failed\n");
......@@ -278,7 +278,7 @@ linktest()
exit();
}
close(fd);
if(link("lf2", "lf2") >= 0){
puts("link lf2 lf2 succeeded! oops\n");
exit();
......@@ -591,7 +591,7 @@ bigfile()
}
}
close(fd);
fd = open("bigfile", 0);
if(fd < 0){
puts("cannot open bigfile\n");
......
ide.c
浏览文件 @ 9e9bcaf1
......@@ -37,10 +37,10 @@ ide_wait_ready(int check_error)
{
int r;
while (((r = inb(0x1F7)) & (IDE_BSY|IDE_DRDY)) != IDE_DRDY)
while(((r = inb(0x1F7)) & (IDE_BSY|IDE_DRDY)) != IDE_DRDY)
/* do nothing */;
if (check_error && (r & (IDE_DF|IDE_ERR)) != 0)
if(check_error && (r & (IDE_DF|IDE_ERR)) != 0)
return -1;
return 0;
}
......@@ -74,13 +74,13 @@ ide_probe_disk1(void)
outb(0x1F6, 0xE0 | (1<<4));
// check for Device 1 to be ready for a while
for (x = 0; x < 1000 && (r = inb(0x1F7)) == 0; x++)
for(x = 0; x < 1000 && (r = inb(0x1F7)) == 0; x++)
/* do nothing */;
// switch back to Device 0
outb(0x1F6, 0xE0 | (0<<4));
return (x < 1000);
return x < 1000;
}
void
......@@ -88,7 +88,7 @@ ide_start_request (void)
{
struct ide_request *r;
if (head != tail) {
if(head != tail) {
r = &request[tail];
ide_wait_ready(0);
outb(0x3f6, 0); // generate interrupt
......@@ -97,7 +97,7 @@ ide_start_request (void)
outb(0x1F4, (r->secno >> 8) & 0xFF);
outb(0x1F5, (r->secno >> 16) & 0xFF);
outb(0x1F6, 0xE0 | ((r->diskno&1)<<4) | ((r->secno>>24)&0x0F));
if (r->read) outb(0x1F7, 0x20); // read
if(r->read) outb(0x1F7, 0x20); // read
else {
outb(0x1F7, 0x30); // write
outsl(0x1F0, r->addr, 512/4);
......@@ -105,7 +105,7 @@ ide_start_request (void)
}
}
void *
void*
ide_start_rw(int diskno, uint secno, void *addr, uint nsecs, int read)
{
struct ide_request *r;
......@@ -113,8 +113,8 @@ ide_start_rw(int diskno, uint secno, void *addr, uint nsecs, int read)
if(diskno && !disk_1_present)
panic("ide disk 1 not present");
while ((head + 1) % NREQUEST == tail)
sleep (&disk_channel, &ide_lock);
while((head + 1) % NREQUEST == tail)
sleep(&disk_channel, &ide_lock);
r = &request[head];
r->secno = secno;
......@@ -134,17 +134,17 @@ int
ide_finish(void *c)
{
int r;
struct ide_request *req = (struct ide_request *) c;
struct ide_request *req = (struct ide_request*) c;
if (req->read) {
if ((r = ide_wait_ready(1)) >= 0)
if(req->read) {
if((r = ide_wait_ready(1)) >= 0)
insl(0x1F0, req->addr, 512/4);
}
if ((head + 1) % NREQUEST == tail) {
if((head + 1) % NREQUEST == tail) {
wakeup(&disk_channel);
}
tail = (tail + 1) % NREQUEST;
ide_start_request();
......@@ -168,8 +168,8 @@ ide_write(int diskno, uint secno, const void *src, uint nsecs)
outb(0x1F6, 0xE0 | ((diskno&1)<<4) | ((secno>>24)&0x0F));
outb(0x1F7, 0x30); // CMD 0x30 means write sector
for (; nsecs > 0; nsecs--, src += 512) {
if ((r = ide_wait_ready(1)) < 0)
for(; nsecs > 0; nsecs--, src += 512) {
if((r = ide_wait_ready(1)) < 0)
return r;
outsl(0x1F0, src, 512/4);
}
......
init.c
浏览文件 @ 9e9bcaf1
......@@ -12,7 +12,7 @@ int
main(void)
{
int pid;
if(open("console", O_RDWR) < 0){
mknod("console", T_DEV, 1, 1);
open("console", O_RDWR);
......
ioapic.c
浏览文件 @ 9e9bcaf1
......@@ -18,7 +18,7 @@ static uint
ioapic_read(struct ioapic *io, int reg)
{
io->ioregsel = reg;
return (io->iowin);
return io->iowin;
}
static void
......@@ -37,13 +37,13 @@ ioapic_init(void)
uchar id;
int i;
io = (struct ioapic *) IO_APIC_BASE;
io = (struct ioapic*) IO_APIC_BASE;
l = ioapic_read(io, IOAPIC_VER);
nintr = ((l & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1;
id = ioapic_read(io, IOAPIC_ID) >> APIC_ID_SHIFT;
if (id != ioapic_id)
panic ("ioapic_init: id isn't equal to ioapic_id\n");
for (i = 0; i < nintr; i++) {
if(id != ioapic_id)
panic("ioapic_init: id isn't equal to ioapic_id\n");
for(i = 0; i < nintr; i++) {
// active-hi and edge-triggered for ISA interrupts
// Assume that pin 0 on the first I/O APIC is an ExtINT pin.
// Assume that pins 1-15 are ISA interrupts
......@@ -68,12 +68,12 @@ ioapic_enable (int irq, int cpunum)
uint l, h;
struct ioapic *io;
io = (struct ioapic *) IO_APIC_BASE;
io = (struct ioapic*) IO_APIC_BASE;
l = ioapic_read(io, IOAPIC_REDTBL_LO(irq));
l = l & ~IOART_INTMASK; // allow INTs
ioapic_write(io, IOAPIC_REDTBL_LO(irq), l);
h = ioapic_read(io, IOAPIC_REDTBL_HI(irq));
h &= ~IOART_DEST;
h |= (cpunum << APIC_ID_SHIFT);
h |= (cpunum << APIC_ID_SHIFT);
ioapic_write(io, IOAPIC_REDTBL_HI(irq), h);
}
kalloc.c
浏览文件 @ 9e9bcaf1
......@@ -34,10 +34,10 @@ kinit(void)
extern int end;
uint mem;
char *start;
initlock(&kalloc_lock, "kalloc");
start = (char *) &end;
start = (char *) (((uint)start + PAGE) & ~(PAGE-1));
start = (char*) &end;
start = (char*) (((uint)start + PAGE) & ~(PAGE-1));
mem = 256; // assume 256 pages of RAM
cprintf("mem = %d\n", mem * PAGE);
kfree(start, mem * PAGE);
......@@ -47,8 +47,8 @@ void
kfree(char *cp, int len)
{
struct run **rr;
struct run *p = (struct run *) cp;
struct run *pend = (struct run *) (cp + len);
struct run *p = (struct run*) cp;
struct run *pend = (struct run*) (cp + len);
int i;
if(len % PAGE)
......@@ -62,7 +62,7 @@ kfree(char *cp, int len)
rr = &freelist;
while(*rr){
struct run *rend = (struct run *) ((char *)(*rr) + (*rr)->len);
struct run *rend = (struct run*) ((char*)(*rr) + (*rr)->len);
if(p >= *rr && p < rend)
panic("freeing free page");
if(pend == *rr){
......@@ -116,10 +116,10 @@ kalloc(int n)
if(r->len == n){
*rr = r->next;
release(&kalloc_lock);
return (char *) r;
return (char*) r;
}
if(r->len > n){
char *p = (char *)r + (r->len - n);
char *p = (char*)r + (r->len - n);
r->len -= n;
release(&kalloc_lock);
return p;
......
lapic.c
浏览文件 @ 9e9bcaf1
......@@ -114,7 +114,7 @@ lapic_timerinit(void)
void
lapic_timerintr(void)
{
lapic_write (LAPIC_EOI, 0);
lapic_write(LAPIC_EOI, 0);
}
void
......@@ -151,13 +151,13 @@ lapic_init(int c)
}
void
lapic_enableintr(void)
lapic_enableintr(void)
{
lapic_write(LAPIC_TPR, 0);
}
void
lapic_disableintr(void)
lapic_disableintr(void)
{
lapic_write(LAPIC_TPR, 0xFF);
}
......@@ -165,7 +165,7 @@ lapic_disableintr(void)
void
lapic_eoi(void)
{
lapic_write (LAPIC_EOI, 0);
lapic_write(LAPIC_EOI, 0);
}
int
......@@ -185,15 +185,15 @@ lapic_startap(uchar apicid, int v)
lapic_write(LAPIC_ICRHI, crhi);
lapic_write(LAPIC_ICRLO, LAPIC_FIELD|APIC_LEVEL|LAPIC_ASSERT|APIC_INIT);
while (j++ < 10000) {;}
while(j++ < 10000) {;}
lapic_write(LAPIC_ICRLO, LAPIC_FIELD|APIC_LEVEL|LAPIC_DEASSERT|APIC_INIT);
while (j++ < 1000000) {;}
while(j++ < 1000000) {;}
// in p9 code, this was i < 2, which is what the spec says on page B-3
for(i = 0; i < 1; i++){
lapic_write(LAPIC_ICRHI, crhi);
lapic_write(LAPIC_ICRLO, LAPIC_FIELD|APIC_EDGE|APIC_STARTUP|(v/4096));
while (j++ < 100000) {;}
while(j++ < 100000) {;}
}
}
ls.c
浏览文件 @ 9e9bcaf1
......@@ -12,10 +12,10 @@ pname(char *n)
{
int i;
for (i = 0; (i < DIRSIZ) && (n[i] != '\0') ; i++) {
for(i = 0; (i < DIRSIZ) && (n[i] != '\0') ; i++) {
printf(1, "%c", n[i]);
}
for (; i < DIRSIZ; i++)
for(; i < DIRSIZ; i++)
printf(1, " ");
}
......@@ -31,12 +31,12 @@ main(int argc, char *argv[])
exit();
}
if (argc == 2) {
if(argc == 2) {
fd = open(argv[1], 0);
if(fd < 0){
printf(2, "ls: cannot open %s\n", argv[1]);
exit();
}
}
} else {
fd = open(".", 0);
if(fd < 0){
......@@ -45,12 +45,12 @@ main(int argc, char *argv[])
}
}
if (fstat(fd, &st) < 0) {
if(fstat(fd, &st) < 0) {
printf(2, "ls: cannot stat dir\n");
exit();
}
switch (st.st_type) {
switch(st.st_type) {
case T_FILE:
pname(argv[1]);
printf(1, "%d %d %d\n", st.st_type, st.st_ino, st.st_size);
......@@ -58,13 +58,13 @@ main(int argc, char *argv[])
case T_DIR:
sz = st.st_size;
for(off = 0; off < sz; off += sizeof(struct dirent)) {
if (read(fd, &dirent, sizeof(struct dirent)) != sizeof(struct dirent)) {
if(read(fd, &dirent, sizeof(struct dirent)) != sizeof(struct dirent)) {
printf(1, "ls: read error\n");
break;
}
if (dirent.inum != 0) {
if(dirent.inum != 0) {
// xxx prepend to name the pathname supplied to ls (e.g. .. in ls ..)
if (stat (dirent.name, &st) < 0) {
if(stat (dirent.name, &st) < 0) {
printf(1, "stat: failed %s\n", dirent.name);
continue;
}
......
main.c
浏览文件 @ 9e9bcaf1
......@@ -66,7 +66,7 @@ main0(void)
// initialize I/O devices, let them enable interrupts
console_init();
ide_init();
ide_init();
// start other CPUs
mp_startthem();
......@@ -136,7 +136,7 @@ process0()
p0->tf->esp = p0->sz;
p1 = copyproc(p0);
load_icode(p1, _binary_init_start, (uint) _binary_init_size);
p1->state = RUNNABLE;
......@@ -152,19 +152,19 @@ load_icode(struct proc *p, uchar *binary, uint size)
struct proghdr *ph;
elf = (struct elfhdr*) binary;
if (elf->magic != ELF_MAGIC)
if(elf->magic != ELF_MAGIC)
panic("load_icode: not an ELF binary");
p->tf->eip = elf->entry;
// Map and load segments as directed.
ph = (struct proghdr*) (binary + elf->phoff);
for (i = 0; i < elf->phnum; i++, ph++) {
if (ph->type != ELF_PROG_LOAD)
for(i = 0; i < elf->phnum; i++, ph++) {
if(ph->type != ELF_PROG_LOAD)
continue;
if (ph->va + ph->memsz < ph->va)
if(ph->va + ph->memsz < ph->va)
panic("load_icode: overflow in elf header segment");
if (ph->va + ph->memsz >= p->sz)
if(ph->va + ph->memsz >= p->sz)
panic("load_icode: icode wants to be above UTOP");
// Load/clear the segment
......
mkdir.c
浏览文件 @ 9e9bcaf1
......@@ -12,7 +12,7 @@ main(int argc, char *argv[])
}
for(i = 1; i < argc; i++){
if (mkdir(argv[i]) < 0) {
if(mkdir(argv[i]) < 0) {
printf(2, "mkdir: %s failed to create\n", argv[i]);
break;
}
......
mkfs.c
浏览文件 @ 9e9bcaf1
......@@ -21,8 +21,8 @@ uint bitblocks;
uint freeinode = 1;
void balloc(int);
void wsect(uint, void *);
void winode(uint, struct dinode *);
void wsect(uint, void*);
void winode(uint, struct dinode*);
void rinode(uint inum, struct dinode *ip);
void rsect(uint sec, void *buf);
uint ialloc(ushort type);
......@@ -33,7 +33,7 @@ ushort
xshort(ushort x)
{
ushort y;
uchar *a = (uchar *) &y;
uchar *a = (uchar*) &y;
a[0] = x;
a[1] = x >> 8;
return y;
......@@ -43,7 +43,7 @@ uint
xint(uint x)
{
uint y;
uchar *a = (uchar *) &y;
uchar *a = (uchar*) &y;
a[0] = x;
a[1] = x >> 8;
a[2] = x >> 16;
......@@ -77,14 +77,14 @@ main(int argc, char *argv[])
sb.nblocks = xint(nblocks); // so whole disk is size sectors
sb.ninodes = xint(ninodes);
bitblocks = size/(512*8) + 1;
bitblocks = size/(512*8) + 1;
usedblocks = ninodes / IPB + 3 + bitblocks;
freeblock = usedblocks;
printf("used %d (bit %d ninode %d) free %d total %d\n", usedblocks,
printf("used %d (bit %d ninode %d) free %d total %d\n", usedblocks,
bitblocks, ninodes/IPB + 1, freeblock, nblocks+usedblocks);
assert (nblocks + usedblocks == size);
assert(nblocks + usedblocks == size);
for(i = 0; i < nblocks + usedblocks; i++)
wsect(i, zeroes);
......@@ -118,7 +118,7 @@ main(int argc, char *argv[])
de.inum = xshort(inum);
strncpy(de.name, argv[i], DIRSIZ);
iappend(rootino, &de, sizeof(de));
while((cc = read(fd, buf, sizeof(buf))) > 0)
iappend(inum, buf, cc);
......@@ -127,7 +127,7 @@ main(int argc, char *argv[])
// fix size of root inode dir
rinode(rootino, &din);
off = xint(din.size);
off = xint(din.size);
off = ((off/BSIZE) + 1) * BSIZE;
din.size = xint(off);
winode(rootino, &din);
......@@ -165,7 +165,7 @@ winode(uint inum, struct dinode *ip)
bn = i2b(inum);
rsect(bn, buf);
dip = ((struct dinode *) buf) + (inum % IPB);
dip = ((struct dinode*) buf) + (inum % IPB);
*dip = *ip;
wsect(bn, buf);
}
......@@ -179,7 +179,7 @@ rinode(uint inum, struct dinode *ip)
bn = i2b(inum);
rsect(bn, buf);
dip = ((struct dinode *) buf) + (inum % IPB);
dip = ((struct dinode*) buf) + (inum % IPB);
*ip = *dip;
}
......@@ -217,9 +217,9 @@ balloc(int used)
int i;
printf("balloc: first %d blocks have been allocated\n", used);
assert (used < 512);
assert(used < 512);
bzero(buf, 512);
for (i = 0; i < used; i++) {
for(i = 0; i < used; i++) {
buf[i/8] = buf[i/8] | (0x1 << (i%8));
}
printf("balloc: write bitmap block at sector %d\n", ninodes/IPB + 3);
......@@ -231,7 +231,7 @@ balloc(int used)
void
iappend(uint inum, void *xp, int n)
{
char *p = (char *) xp;
char *p = (char*) xp;
uint fbn, off, n1;
struct dinode din;
char buf[512];
......@@ -244,7 +244,7 @@ iappend(uint inum, void *xp, int n)
while(n > 0){
fbn = off / 512;
assert(fbn < MAXFILE);
if (fbn < NDIRECT) {
if(fbn < NDIRECT) {
if(xint(din.addrs[fbn]) == 0) {
din.addrs[fbn] = xint(freeblock++);
usedblocks++;
......@@ -257,11 +257,11 @@ iappend(uint inum, void *xp, int n)
usedblocks++;
}
printf("read indirect block\n");
rsect(xint(din.addrs[INDIRECT]), (char *) indirect);
if (indirect[fbn - NDIRECT] == 0) {
rsect(xint(din.addrs[INDIRECT]), (char*) indirect);
if(indirect[fbn - NDIRECT] == 0) {
indirect[fbn - NDIRECT] = xint(freeblock++);
usedblocks++;
wsect(xint(din.addrs[INDIRECT]), (char *) indirect);
wsect(xint(din.addrs[INDIRECT]), (char*) indirect);
}
x = xint(indirect[fbn-NDIRECT]);
}
......
mmu.h
浏览文件 @ 9e9bcaf1
......@@ -84,21 +84,21 @@ struct taskstate {
uint esp0; // Stack pointers and segment selectors
ushort ss0; // after an increase in privilege level
ushort padding1;
uint * esp1;
uint *esp1;
ushort ss1;
ushort padding2;
uint * esp2;
uint *esp2;
ushort ss2;
ushort padding3;
void * cr3; // Page directory base
uint * eip; // Saved state from last task switch
void *cr3; // Page directory base
uint *eip; // Saved state from last task switch
uint eflags;
uint eax; // More saved state (registers)
uint ecx;
uint edx;
uint ebx;
uint * esp;
uint * ebp;
uint *esp;
uint *ebp;
uint esi;
uint edi;
ushort es; // Even more saved state (segment selectors)
......
mp.c
浏览文件 @ 9e9bcaf1
......@@ -7,7 +7,7 @@
#include "mmu.h"
#include "proc.h"
static char* buses[] = {
static char *buses[] = {
"CBUSI ",
"CBUSII",
"EISA ",
......@@ -34,7 +34,7 @@ int ncpu;
uchar ioapic_id;
static struct cpu *bcpu;
static struct mp* mp; // The MP floating point structure
static struct mp *mp; // The MP floating point structure
static struct mp*
mp_scan(uchar *addr, int len)
......@@ -50,7 +50,7 @@ mp_scan(uchar *addr, int len)
for(i = 0; i < sizeof(struct mp); i++)
sum += p[i];
if(sum == 0)
return (struct mp *)p;
return (struct mp*)p;
}
return 0;
}
......@@ -82,7 +82,7 @@ mp_search(void)
return mp_scan((uchar*)0xF0000, 0x10000);
}
static int
static int
mp_detect(void)
{
struct mpctb *pcmp;
......@@ -99,7 +99,7 @@ mp_detect(void)
if((mp = mp_search()) == 0 || mp->physaddr == 0)
return 1;
pcmp = (struct mpctb *) mp->physaddr;
pcmp = (struct mpctb*) mp->physaddr;
if(memcmp(pcmp, "PCMP", 4))
return 2;
......@@ -116,7 +116,7 @@ mp_detect(void)
void
mp_init(void)
{
{
int r;
uchar *p, *e;
struct mpctb *mpctb;
......@@ -128,31 +128,31 @@ mp_init(void)
uchar byte;
ncpu = 0;
if ((r = mp_detect()) != 0) return;
if((r = mp_detect()) != 0) return;
/*
* Run through the table saving information needed for starting
* application processors and initialising any I/O APICs. The table
* is guaranteed to be in order such that only one pass is necessary.
*/
mpctb = (struct mpctb *) mp->physaddr;
lapicaddr = (uint *) mpctb->lapicaddr;
mpctb = (struct mpctb*) mp->physaddr;
lapicaddr = (uint*) mpctb->lapicaddr;
p = ((uchar*)mpctb)+sizeof(struct mpctb);
e = ((uchar*)mpctb)+mpctb->length;
while(p < e) {
switch(*p){
case MPPROCESSOR:
proc = (struct mppe *) p;
proc = (struct mppe*) p;
cpus[ncpu].apicid = proc->apicid;
if (proc->flags & MPBP) {
if(proc->flags & MPBP) {
bcpu = &cpus[ncpu];
}
ncpu++;
p += sizeof(struct mppe);
continue;
case MPBUS:
bus = (struct mpbe *) p;
bus = (struct mpbe*) p;
for(i = 0; buses[i]; i++){
if(strncmp(buses[i], bus->string, sizeof(bus->string)) == 0)
break;
......@@ -160,12 +160,12 @@ mp_init(void)
p += sizeof(struct mpbe);
continue;
case MPIOAPIC:
ioapic = (struct mpioapic *) p;
ioapic = (struct mpioapic*) p;
ioapic_id = ioapic->apicno;
p += sizeof(struct mpioapic);
continue;
case MPIOINTR:
intr = (struct mpie *) p;
intr = (struct mpie*) p;
p += sizeof(struct mpie);
continue;
default:
......@@ -178,7 +178,7 @@ mp_init(void)
}
}
if (mp->imcrp) { // it appears that bochs doesn't support IMCR, and code won't run
if(mp->imcrp) { // it appears that bochs doesn't support IMCR, and code won't run
outb(0x22, 0x70); /* select IMCR */
byte = inb(0x23); /* current contents */
byte |= 0x01; /* mask external INTR */
......@@ -204,13 +204,13 @@ mp_startthem(void)
extern int main();
int c;
memmove((void *) APBOOTCODE,_binary_bootother_start,
memmove((void*) APBOOTCODE,_binary_bootother_start,
(uint) _binary_bootother_size);
for(c = 0; c < ncpu; c++){
if (c == cpu()) continue;
*(uint *)(APBOOTCODE-4) = (uint) (cpus[c].mpstack) + MPSTACK; // tell it what to use for %esp
*(uint *)(APBOOTCODE-8) = (uint)mpmain; // tell it where to jump to
if(c == cpu()) continue;
*(uint*)(APBOOTCODE-4) = (uint) (cpus[c].mpstack) + MPSTACK; // tell it what to use for %esp
*(uint*)(APBOOTCODE-8) = (uint)mpmain; // tell it where to jump to
lapic_startap(cpus[c].apicid, (uint) APBOOTCODE);
while(cpus[c].booted == 0)
;
......
mp.h
浏览文件 @ 9e9bcaf1
......@@ -5,7 +5,7 @@
struct mp { /* floating pointer */
uchar signature[4]; /* "_MP_" */
void* physaddr; /* physical address of MP configuration table */
void *physaddr; /* physical address of MP configuration table */
uchar length; /* 1 */
uchar specrev; /* [14] */
uchar checksum; /* all bytes must add up to 0 */
......@@ -20,10 +20,10 @@ struct mpctb { /* configuration table header */
uchar version; /* [14] */
uchar checksum; /* all bytes must add up to 0 */
uchar product[20]; /* product id */
uint * oemtable; /* OEM table pointer */
uint *oemtable; /* OEM table pointer */
ushort oemlength; /* OEM table length */
ushort entry; /* entry count */
uint * lapicaddr; /* address of local APIC */
uint *lapicaddr; /* address of local APIC */
ushort xlength; /* extended table length */
uchar xchecksum; /* extended table checksum */
uchar reserved;
......@@ -50,7 +50,7 @@ struct mpioapic { /* I/O APIC table entry */
uchar apicno; /* I/O APIC id */
uchar version; /* I/O APIC version */
uchar flags; /* I/O APIC flags */
uint * addr; /* I/O APIC address */
uint *addr; /* I/O APIC address */
};
struct mpie { /* interrupt table entry */
......
picirq.c
浏览文件 @ 9e9bcaf1
......@@ -73,6 +73,6 @@ pic_init(void)
outb(IO_PIC2, 0x68); /* OCW3 */
outb(IO_PIC2, 0x0a); /* OCW3 */
if (irq_mask_8259A != 0xFFFF)
if(irq_mask_8259A != 0xFFFF)
irq_setmask_8259A(irq_mask_8259A);
}
pipe.c
浏览文件 @ 9e9bcaf1
......@@ -28,7 +28,7 @@ pipe_alloc(struct fd **fd1, struct fd **fd2)
goto oops;
if((*fd2 = fd_alloc()) == 0)
goto oops;
if((p = (struct pipe *) kalloc(PAGE)) == 0)
if((p = (struct pipe*) kalloc(PAGE)) == 0)
goto oops;
p->readopen = 1;
p->writeopen = 1;
......@@ -46,7 +46,7 @@ pipe_alloc(struct fd **fd1, struct fd **fd2)
return 0;
oops:
if(p)
kfree((char *) p, PAGE);
kfree((char*) p, PAGE);
if(*fd1){
(*fd1)->type = FD_NONE;
fd_close(*fd1);
......@@ -70,11 +70,11 @@ pipe_close(struct pipe *p, int writeable)
p->readopen = 0;
wakeup(&p->writep);
}
release(&p->lock);
if(p->readopen == 0 && p->writeopen == 0)
kfree((char *) p, PAGE);
kfree((char*) p, PAGE);
}
int
......
printf.c
浏览文件 @ 9e9bcaf1
......@@ -5,7 +5,7 @@
static void
putc(int fd, char c)
{
write (fd, &c, 1);
write(fd, &c, 1);
}
static void
......@@ -15,7 +15,7 @@ printint(int fd, int xx, int base, int sgn)
char digits[] = "0123456789ABCDEF";
int i = 0, neg = 0;
uint x;
if(sgn && xx < 0){
neg = 1;
x = 0 - xx;
......@@ -40,7 +40,7 @@ void
printf(int fd, char *fmt, ...)
{
int i, state = 0, c;
uint *ap = (uint *)(void*)&fmt + 1;
uint *ap = (uint*)(void*)&fmt + 1;
for(i = 0; fmt[i]; i++){
c = fmt[i] & 0xff;
......
proc.c
浏览文件 @ 9e9bcaf1
......@@ -63,7 +63,7 @@ allocproc(void)
{
int i;
struct proc *p;
for(i = 0; i < NPROC; i++){
p = &proc[i];
if(p->state == UNUSED){
......@@ -75,11 +75,11 @@ allocproc(void)
}
// Create a new process copying p as the parent.
// Does not copy the kernel stack.
// Does not copy the kernel stack.
// Instead, sets up stack to return as if from system call.
// Caller must arrange for process to run (set state to RUNNABLE).
struct proc *
copyproc(struct proc* p)
struct proc*
copyproc(struct proc *p)
{
int i;
struct proc *np;
......@@ -115,7 +115,7 @@ copyproc(struct proc* p)
// Copy trapframe registers from parent.
np->tf = (struct trapframe*)(np->kstack + KSTACKSIZE) - 1;
memmove(np->tf, p->tf, sizeof(*np->tf));
// Clear %eax so that fork system call returns 0 in child.
np->tf->eax = 0;
......@@ -155,7 +155,7 @@ growproc(int n)
return cp->sz - n;
}
// Per-CPU process scheduler.
// Per-CPU process scheduler.
// Each CPU calls scheduler() after setting itself up.
// Scheduler never returns. It loops, doing:
// - choose a process to run
......@@ -176,8 +176,8 @@ scheduler(void)
p = &proc[i];
if(p->state != RUNNABLE)
continue;
// Switch to chosen process. It is the process's job
// Switch to chosen process. It is the process's job
// to release proc_table_lock and then reacquire it
// before jumping back to us.
......@@ -186,11 +186,11 @@ scheduler(void)
p->state = RUNNING;
if(setjmp(&cpus[cpu()].jmpbuf) == 0)
longjmp(&p->jmpbuf);
// Process is done running for now.
// Process is done running for now.
// It should have changed its p->state before coming back.
curproc[cpu()] = 0;
setupsegs(0);
}
......@@ -228,7 +228,7 @@ forkret(void)
{
// Still holding proc_table_lock from scheduler.
release(&proc_table_lock);
// Jump into assembly, never to return.
forkret1(curproc[cpu()]->tf);
}
......@@ -246,9 +246,9 @@ sleep(void *chan, struct spinlock *lk)
if(lk == 0)
panic("sleep without lk");
// Must acquire proc_table_lock in order to
// Must acquire proc_table_lock in order to
// change p->state and then call sched.
// Once we hold proc_table_lock, we can be
// Once we hold proc_table_lock, we can be
// guaranteed that we won't miss any wakeup
// (wakeup runs with proc_table_lock locked),
// so it's okay to release lk.
......@@ -318,7 +318,7 @@ proc_kill(int pid)
}
// Exit the current process. Does not return.
// Exited processes remain in the zombie state
// Exited processes remain in the zombie state
// until their parent calls wait() to find out they exited.
void
proc_exit(void)
......@@ -334,7 +334,7 @@ proc_exit(void)
cp->fds[fd] = 0;
}
}
idecref(cp->cwd);
cp->cwd = 0;
......@@ -349,7 +349,7 @@ proc_exit(void)
for(p = proc; p < &proc[NPROC]; p++)
if(p->ppid == cp->pid)
p->ppid = 1;
// Jump into the scheduler, never to return.
cp->killed = 0;
cp->state = ZOMBIE;
......@@ -392,7 +392,7 @@ proc_wait(void)
release(&proc_table_lock);
return -1;
}
// Wait for children to exit. (See wakeup1 call in proc_exit.)
sleep(cp, &proc_table_lock);
}
......
rm.c
浏览文件 @ 9e9bcaf1
......@@ -12,7 +12,7 @@ main(int argc, char *argv[])
}
for(i = 1; i < argc; i++){
if (unlink(argv[i]) < 0) {
if(unlink(argv[i]) < 0) {
printf(2, "mkdir: %s failed to create\n", argv[i]);
break;
}
......
setjmp.S
浏览文件 @ 9e9bcaf1
.globl setjmp
setjmp:
movl 4(%esp), %eax
movl %ebx, 0(%eax)
movl %ecx, 4(%eax)
movl %edx, 8(%eax)
......@@ -11,14 +11,14 @@ setjmp:
movl %ebp, 24(%eax)
pushl 0(%esp) /* %eip */
popl 28(%eax)
movl $0, %eax /* return value */
ret
.globl longjmp
longjmp:
movl 4(%esp), %eax
movl 0(%eax), %ebx
movl 4(%eax), %ecx
movl 8(%eax), %edx
......@@ -29,7 +29,7 @@ longjmp:
addl $4, %esp /* pop %eip into thin air */
pushl 28(%eax) /* push new %eip */
movl $1, %eax /* return value (appears to come from setjmp!) */
ret
sh.c
浏览文件 @ 9e9bcaf1
......@@ -25,7 +25,7 @@ struct cmd {
int argc;
int token;
};
struct cmd cmdlist[MAXCMD];
struct cmd cmdlist[MAXCMD];
int nextcmd;
char buf[BUFSIZ];
......@@ -43,15 +43,15 @@ main(void)
{
while(1){
puts("$ ");
memset (buf, '\0', sizeof(buf));
memset(buf, '\0', sizeof(buf));
gets(buf, sizeof(buf));
if (parse(buf) < 0)
if(parse(buf) < 0)
continue;
runcmd();
}
}
int
int
parse(char *s)
{
char *t;
......@@ -61,33 +61,33 @@ parse(char *s)
nextio = 0;
nextcmd = 0;
for (i = 0; i < MAXCMD; i++) {
for(i = 0; i < MAXCMD; i++) {
cmdlist[i].argc = 0;
cmdlist[i].token = 0;
}
while (1) {
switch ((c = gettoken(0, &t))) {
while(1) {
switch((c = gettoken(0, &t))) {
case 'w': // Add an argument
if (cmdlist[nextcmd].argc >= MAXARGS) {
if(cmdlist[nextcmd].argc >= MAXARGS) {
printf(2, "too many arguments\n");
return -1;
}
cmdlist[nextcmd].argv[cmdlist[nextcmd].argc++] = t;
break;
case '<': // Input redirection
// Grab the filename from the argument list
if (gettoken(0, &t) != 'w') {
if(gettoken(0, &t) != 'w') {
printf(2, "syntax error: < not followed by word\n");
return -1;
}
addio('<', t);
break;
case '>': // Output redirection
// Grab the filename from the argument list
if (gettoken(0, &t) != 'w') {
if(gettoken(0, &t) != 'w') {
printf(2, "syntax error: > not followed by word\n");
return -1;
}
......@@ -102,11 +102,11 @@ parse(char *s)
case 0: // String is complete
return 0;
default:
printf(2, "syntax error: bad return %d from gettoken", c);
return -1;
}
}
}
......@@ -120,90 +120,90 @@ runcmd(void)
// Return immediately if command line was empty.
if(cmdlist[0].argc == 0) {
if (debug)
if(debug)
printf(2, "EMPTY COMMAND\n");
return;
}
for (c = 0; c <= nextcmd; c++) {
for(c = 0; c <= nextcmd; c++) {
// Clean up command line.
// Read all commands from the filesystem: add an initial '/' to
// the command name.
// This essentially acts like 'PATH=/'.
if (cmdlist[c].argv[0][0] != '/') {
if(cmdlist[c].argv[0][0] != '/') {
cmdlist[c].argv0buf[0] = '/';
strcpy(cmdlist[c].argv0buf + 1, cmdlist[c].argv[0]);
cmdlist[c].argv[0] = cmdlist[c].argv0buf;
}
cmdlist[c].argv[cmdlist[c].argc] = 0;
// Print the command.
if (debug) {
if(debug) {
printf(2, "[%d] SPAWN:", getpid());
for (i = 0; cmdlist[c].argv[i]; i++)
for(i = 0; cmdlist[c].argv[i]; i++)
printf(2, " %s", cmdlist[c].argv[i]);
for (i = 0; i < nextio; i++) {
for(i = 0; i < nextio; i++) {
printf(2, "%c %s", iolist[i].token, iolist[i].s);
}
printf(2, "\n");
}
if (strcmp(cmdlist[c].argv[0], "/cd") == 0) {
if (debug) printf (2, "/cd %s is build in\n", cmdlist[c].argv[1]);
if(strcmp(cmdlist[c].argv[0], "/cd") == 0) {
if(debug) printf (2, "/cd %s is build in\n", cmdlist[c].argv[1]);
chdir(cmdlist[c].argv[1]);
return;
}
if (cmdlist[c].token == '|')
if (pipe(fdarray) < 0)
if(cmdlist[c].token == '|')
if(pipe(fdarray) < 0)
printf(2, "cmd %d pipe failed\n", c);
pid = fork();
if (pid == 0) {
if (cmdlist[c].token == '|') {
if (close(1) < 0)
if(pid == 0) {
if(cmdlist[c].token == '|') {
if(close(1) < 0)
printf(2, "close 1 failed\n");
if ((tfd = dup(fdarray[1])) < 0)
if((tfd = dup(fdarray[1])) < 0)
printf(2, "dup failed\n");
if (close(fdarray[0]) < 0)
if(close(fdarray[0]) < 0)
printf(2, "close fdarray[0] failed\n");
if (close(fdarray[1]) < 0)
if(close(fdarray[1]) < 0)
printf(2, "close fdarray[1] failed\n");
}
if (c > 0 && cmdlist[c-1].token == '|') {
if (close(0) < 0)
if(c > 0 && cmdlist[c-1].token == '|') {
if(close(0) < 0)
printf(2, "close 0 failed\n");
if ((tfd = dup(fdarray[0])) < 0)
if((tfd = dup(fdarray[0])) < 0)
printf(2, "dup failed\n");
if (close(fdarray[0]) < 0)
if(close(fdarray[0]) < 0)
printf(2, "close fdarray[0] failed\n");
if (close(fdarray[1]) < 0)
if(close(fdarray[1]) < 0)
printf(2, "close fdarray[1] failed\n");
}
if (ioredirection() < 0)
if(ioredirection() < 0)
exit();
if ((r = exec(cmdlist[c].argv0buf, (char**) cmdlist[c].argv)) < 0) {
if((r = exec(cmdlist[c].argv0buf, (char**) cmdlist[c].argv)) < 0) {
printf(2, "exec %s: %d\n", cmdlist[c].argv[0], r);
exit();
}
} else if (pid > 0) {
} else if(pid > 0) {
int p;
if (debug)
if(debug)
printf(2, "[%d] FORKED child %d\n", getpid(), pid);
if (c > 0 && cmdlist[c-1].token == '|') {
if(c > 0 && cmdlist[c-1].token == '|') {
close(fdarray[0]);
close(fdarray[1]);
}
if (cmdlist[c].token != '|') {
if (debug)
if(cmdlist[c].token != '|') {
if(debug)
printf(2, "[%d] WAIT for children\n", getpid());
do {
p = wait();
if (debug)
if(debug)
printf(2, "[%d] WAIT child %d finished\n", getpid(), p);
} while (p > 0);
if (debug)
} while(p > 0);
if(debug)
printf(2, "[%d] wait finished\n", getpid());
}
}
......@@ -215,26 +215,26 @@ ioredirection(void)
{
int i, fd;
for (i = 0; i < nextio; i++) {
switch (iolist[i].token) {
for(i = 0; i < nextio; i++) {
switch(iolist[i].token) {
case '<':
if (close(0) < 0)
if(close(0) < 0)
printf(2, "close 0 failed\n");
if ((fd = open(iolist[i].s, O_RDONLY)) < 0) {
if((fd = open(iolist[i].s, O_RDONLY)) < 0) {
printf(2, "failed to open %s for read: %d", iolist[i].s, fd);
return -1;
}
if (debug)
if(debug)
printf(2, "redirect 0 from %s\n", iolist[i].s);
break;
case '>':
if (close(1) < 0)
if(close(1) < 0)
printf(2, "close 1 failed\n");
if ((fd = open(iolist[i].s, O_WRONLY|O_CREATE)) < 0) {
if((fd = open(iolist[i].s, O_WRONLY|O_CREATE)) < 0) {
printf(2, "failed to open %s for write: %d", iolist[i].s, fd);
exit();
}
if (debug)
if(debug)
printf(2, "redirect 1 to %s\n", iolist[i].s);
break;
}
......@@ -245,11 +245,11 @@ ioredirection(void)
void
addio(int token, char *s)
{
if (nextio >= MAXNODE) {
if(nextio >= MAXNODE) {
printf(2, "addio: ran out of nodes\n");
return;
}
iolist[nextio].token = token;
iolist[nextio].s = s;
nextio++;
......@@ -267,9 +267,9 @@ int
gettoken(char *s, char **p1)
{
static int c, nc;
static char* np1, *np2;
static char *np1, *np2;
if (s) {
if(s) {
nc = _gettoken(s, &np1, &np2);
return 0;
}
......@@ -299,39 +299,39 @@ _gettoken(char *s, char **p1, char **p2)
{
int t;
if (s == 0) {
if (debug > 1)
if(s == 0) {
if(debug > 1)
printf(2, "GETTOKEN NULL\n");
return 0;
}
if (debug > 1)
if(debug > 1)
printf(2, "GETTOKEN: %s\n", s);
*p1 = 0;
*p2 = 0;
while (strchr(WHITESPACE, *s))
while(strchr(WHITESPACE, *s))
*s++ = 0;
if (*s == 0) {
if (debug > 1)
if(*s == 0) {
if(debug > 1)
printf(2, "EOL\n");
return 0;
}
if (strchr(SYMBOLS, *s)) {
if(strchr(SYMBOLS, *s)) {
t = *s;
*p1 = s;
*s++ = 0;
*p2 = s;
if (debug > 1)
if(debug > 1)
printf(2, "TOK %c\n", t);
return t;
}
*p1 = s;
while (*s && !strchr(WHITESPACE SYMBOLS, *s))
while(*s && !strchr(WHITESPACE SYMBOLS, *s))
s++;
*p2 = s;
if (debug > 1) {
if(debug > 1) {
t = **p2;
**p2 = 0;
printf(2, "WORD: %s\n", *p1);
......
spinlock.c
浏览文件 @ 9e9bcaf1
......@@ -29,7 +29,7 @@ getcallerpcs(void *v, uint pcs[])
}
void
acquire(struct spinlock * lock)
acquire(struct spinlock *lock)
{
if(holding(lock))
panic("acquire");
......@@ -37,7 +37,7 @@ acquire(struct spinlock * lock)
if(cpus[cpu()].nlock == 0)
cli();
cpus[cpu()].nlock++;
while(cmpxchg(0, 1, &lock->locked) == 1)
;
cpuid(0, 0, 0, 0, 0); // memory barrier
......@@ -46,7 +46,7 @@ acquire(struct spinlock * lock)
}
void
release(struct spinlock * lock)
release(struct spinlock *lock)
{
if(!holding(lock))
......
string.c
浏览文件 @ 9e9bcaf1
#include "types.h"
#include "defs.h"
void *
void*
memset(void *dst, int c, uint n)
{
char *d = (char *) dst;
char *d = (char*) dst;
while(n-- > 0)
*d++ = c;
......@@ -15,11 +15,11 @@ memset(void *dst, int c, uint n)
int
memcmp(const void *v1, const void *v2, uint n)
{
const uchar *s1 = (const uchar *) v1;
const uchar *s2 = (const uchar *) v2;
const uchar *s1 = (const uchar*) v1;
const uchar *s2 = (const uchar*) v2;
while (n-- > 0) {
if (*s1 != *s2)
while(n-- > 0) {
if(*s1 != *s2)
return (int) *s1 - (int) *s2;
s1++, s2++;
}
......@@ -27,7 +27,7 @@ memcmp(const void *v1, const void *v2, uint n)
return 0;
}
void *
void*
memmove(void *dst, const void *src, uint n)
{
const char *s;
......@@ -35,13 +35,13 @@ memmove(void *dst, const void *src, uint n)
s = src;
d = dst;
if (s < d && s + n > d) {
if(s < d && s + n > d) {
s += n;
d += n;
while (n-- > 0)
while(n-- > 0)
*--d = *--s;
} else
while (n-- > 0)
while(n-- > 0)
*d++ = *s++;
return dst;
......@@ -50,9 +50,9 @@ memmove(void *dst, const void *src, uint n)
int
strncmp(const char *p, const char *q, uint n)
{
while (n > 0 && *p && *p == *q)
while(n > 0 && *p && *p == *q)
n--, p++, q++;
if (n == 0)
if(n == 0)
return 0;
else
return (int) ((uchar) *p - (uchar) *q);
......
syscall.c
浏览文件 @ 9e9bcaf1
......@@ -41,7 +41,7 @@ fetchint(struct proc *p, uint addr, int *ip)
// Fetch byte from a user-supplied pointer.
// Returns 0 on success, -1 if pointer is illegal.
int
fetchbyte(struct proc *p, uint addr, char* c)
fetchbyte(struct proc *p, uint addr, char *c)
{
if(addr >= p->sz)
return -1;
......@@ -262,10 +262,10 @@ sys_open(void)
iunlock(ip);
fd->type = FD_FILE;
if (arg1 & O_RDWR) {
if(arg1 & O_RDWR) {
fd->readable = 1;
fd->writeable = 1;
} else if (arg1 & O_WRONLY) {
} else if(arg1 & O_WRONLY) {
fd->readable = 0;
fd->writeable = 1;
} else {
......@@ -287,7 +287,7 @@ sys_mknod(void)
uint arg0, arg1, arg2, arg3;
int l;
if(fetcharg(0, &arg0) < 0 || fetcharg(1, &arg1) < 0 ||
if(fetcharg(0, &arg0) < 0 || fetcharg(1, &arg1) < 0 ||
fetcharg(2, &arg2) < 0 || fetcharg(3, &arg3) < 0)
return -1;
......@@ -297,7 +297,7 @@ sys_mknod(void)
if(l >= DIRSIZ)
return -1;
nip = mknod (cp->mem + arg0, (short) arg1, (short) arg2, (short) arg3);
nip = mknod(cp->mem + arg0, (short) arg1, (short) arg2, (short) arg3);
if(nip)
iput(nip);
return (nip == 0) ? -1 : 0;
......@@ -314,7 +314,7 @@ sys_mkdir(void)
struct dirent de;
char *last;
if(fetcharg(0, &arg0) < 0)
if(fetcharg(0, &arg0) < 0)
return -1;
if((l = checkstring(arg0)) < 0)
......@@ -332,15 +332,15 @@ sys_mkdir(void)
dp->nlink += 1;
iupdate(dp);
memset (de.name, '\0', DIRSIZ);
memset(de.name, '\0', DIRSIZ);
de.name[0] = '.';
de.inum = nip->inum;
writei (nip, (char *) &de, 0, sizeof(de));
writei(nip, (char*) &de, 0, sizeof(de));
de.inum = dp->inum;
de.name[1] = '.';
writei (nip, (char *) &de, sizeof(de), sizeof(de));
writei(nip, (char*) &de, sizeof(de), sizeof(de));
iput(dp);
iput(nip);
......@@ -356,22 +356,22 @@ sys_chdir(void)
struct inode *ip;
uint arg0;
int l;
if(fetcharg(0, &arg0) < 0)
if(fetcharg(0, &arg0) < 0)
return -1;
if((l = checkstring(arg0)) < 0)
return -1;
if ((ip = namei(cp->mem + arg0, NAMEI_LOOKUP, 0, 0, 0)) == 0)
if((ip = namei(cp->mem + arg0, NAMEI_LOOKUP, 0, 0, 0)) == 0)
return -1;
if (ip == cp->cwd) {
iput (ip);
if(ip == cp->cwd) {
iput(ip);
return 0;
}
if (ip->type != T_DIR) {
if(ip->type != T_DIR) {
iput(ip);
return -1;
}
......@@ -388,7 +388,7 @@ sys_unlink(void)
struct proc *cp = curproc[cpu()];
uint arg0;
int r;
if(fetcharg(0, &arg0) < 0)
return -1;
if(checkstring(arg0) < 0)
......@@ -403,7 +403,7 @@ sys_fstat(void)
struct proc *cp = curproc[cpu()];
uint fd, addr;
int r;
if(fetcharg(0, &fd) < 0)
return -1;
if(fetcharg(1, &addr) < 0)
......@@ -414,7 +414,7 @@ sys_fstat(void)
return -1;
if(addr + sizeof(struct stat) > cp->sz)
return -1;
r = fd_stat (cp->fds[fd], (struct stat *)(cp->mem + addr));
r = fd_stat(cp->fds[fd], (struct stat*)(cp->mem + addr));
return r;
}
......@@ -423,14 +423,14 @@ sys_dup(void)
{
struct proc *cp = curproc[cpu()];
uint fd, ufd1;
if(fetcharg(0, &fd) < 0)
return -1;
if(fd < 0 || fd >= NOFILE)
return -1;
if(cp->fds[fd] == 0)
if(cp->fds[fd] == 0)
return -1;
if ((ufd1 = fd_ualloc()) < 0)
if((ufd1 = fd_ualloc()) < 0)
return -1;
cp->fds[ufd1] = cp->fds[fd];
fd_incref(cp->fds[ufd1]);
......@@ -443,7 +443,7 @@ sys_link(void)
struct proc *cp = curproc[cpu()];
uint name1, name2;
int r;
if(fetcharg(0, &name1) < 0 || checkstring(name1) < 0)
return -1;
if(fetcharg(1, &name2) < 0 || checkstring(name2) < 0)
......@@ -471,7 +471,7 @@ sys_sbrk(void)
return -1;
if((addr = growproc(n)) == 0xffffffff)
return -1;
setupsegs(cp);
setupsegs(cp);
return addr;
}
......@@ -513,7 +513,7 @@ sys_exec(void)
goto bad;
sz += ph.memsz;
}
sz += 4096 - (sz % 4096);
sz += 4096;
......
trap.c
浏览文件 @ 9e9bcaf1
......@@ -57,7 +57,7 @@ trap(struct trapframe *tf)
// out to its regular system call return.)
if((tf->cs&3) == 3 && cp->killed)
proc_exit();
// Force process to give up CPU and let others run.
if(cp->state == RUNNING)
yield();
......@@ -85,7 +85,7 @@ trap(struct trapframe *tf)
}
if(curproc[cpu()]) {
cprintf("pid %d: unhandled trap %d on cpu %d eip %x---terminate process\n",
cprintf("pid %d: unhandled trap %d on cpu %d eip %x---terminate process\n",
curproc[cpu()]->pid, v, cpu(), tf->eip);
proc_exit();
}
......
trapasm.S
浏览文件 @ 9e9bcaf1
......@@ -15,7 +15,7 @@ alltraps:
call trap # and call trap()
addl $4, %esp
# return falls through to trapret...
/*
* a forked process RETs here
* expects ESP to point to a Trapframe
......@@ -32,7 +32,7 @@ trapret:
forkret1:
movl 4(%esp), %esp
jmp trapret
.globl acpu
acpu:
.long 0
traps.h
浏览文件 @ 9e9bcaf1
......@@ -6,7 +6,7 @@
#define T_OFLOW 4 // overflow
#define T_BOUND 5 // bounds check
#define T_ILLOP 6 // illegal opcode
#define T_DEVICE 7 // device not available
#define T_DEVICE 7 // device not available
#define T_DBLFLT 8 // double fault
/* #define T_COPROC 9 */ // reserved (not generated by recent processors)
#define T_TSS 10 // invalid task switch segment
......
ulib.c
浏览文件 @ 9e9bcaf1
......@@ -13,7 +13,7 @@ char*
strcpy(char *s, char *t)
{
char *os;
os = s;
while((*s++ = *t++) != 0)
;
......@@ -23,7 +23,7 @@ strcpy(char *s, char *t)
int
strcmp(const char *p, const char *q)
{
while (*p && *p == *q)
while(*p && *p == *q)
p++, q++;
return (int) ((unsigned char) *p - (unsigned char) *q);
}
......@@ -40,7 +40,7 @@ strlen(char *s)
void*
memset(void *dst, int c, unsigned int n)
{
char *d = (char *) dst;
char *d = (char*) dst;
while(n-- > 0)
*d++ = c;
......@@ -51,9 +51,9 @@ memset(void *dst, int c, unsigned int n)
char*
strchr(const char *s, char c)
{
for (; *s; s++)
if (*s == c)
return (char *) s;
for(; *s; s++)
if(*s == c)
return (char*) s;
return 0;
}
......@@ -62,7 +62,7 @@ gets(char *buf, int max)
{
int i = 0, cc;
char c;
while(i+1 < max){
cc = read(0, &c, 1);
if(cc < 1)
......@@ -82,7 +82,7 @@ stat(char *n, struct stat *st)
int r;
fd = open(n, O_RDONLY);
if (fd < 0) return -1;
if(fd < 0) return -1;
r = fstat(fd, st);
close(fd);
return r;
......
umalloc.c
浏览文件 @ 9e9bcaf1
......@@ -3,7 +3,7 @@
#include "user.h"
#include "param.h"
// Memory allocator by Kernighan and Ritchie, The C programming Language,
// Memory allocator by Kernighan and Ritchie, The C programming Language,
// 2nd ed. Section 8.7.
typedef long Align;
......@@ -26,16 +26,16 @@ free(void *ap)
{
Header *bp, *p;
bp = (Header *) ap - 1;
for (p = freep; !(bp > p && bp < p->s.ptr); p = p->s.ptr)
if (p >= p->s.ptr && (bp > p || bp < p->s.ptr))
bp = (Header*) ap - 1;
for(p = freep; !(bp > p && bp < p->s.ptr); p = p->s.ptr)
if(p >= p->s.ptr && (bp > p || bp < p->s.ptr))
break;
if (bp + bp->s.size == p->s.ptr) {
if(bp + bp->s.size == p->s.ptr) {
bp->s.size += p->s.ptr->s.size;
bp->s.ptr = p->s.ptr->s.ptr;
} else
bp->s.ptr = p->s.ptr;
if (p + p->s.size == bp) {
if(p + p->s.size == bp) {
p->s.size += bp->s.size;
p->s.ptr = bp->s.ptr;
} else
......@@ -43,37 +43,37 @@ free(void *ap)
freep = p;
}
static Header *
static Header*
morecore(uint nu)
{
char *cp;
Header *up;
if (nu < PAGE)
if(nu < PAGE)
nu = PAGE;
cp = sbrk(nu * sizeof(Header));
if (cp == (char *) -1)
if(cp == (char*) -1)
return 0;
up = (Header *) cp;
up = (Header*) cp;
up->s.size = nu;
free((void *)(up + 1));
free((void*)(up + 1));
return freep;
}
void *
void*
malloc(uint nbytes)
{
Header *p, *prevp;
uint nunits;
nunits = (nbytes + sizeof(Header) - 1)/sizeof(Header) + 1;
if ((prevp = freep) == 0) {
if((prevp = freep) == 0) {
base.s.ptr = freep = prevp = &base;
base.s.size = 0;
}
for (p = prevp->s.ptr; ; prevp = p, p = p->s.ptr) {
if (p->s.size >= nunits) {
if (p->s.size == nunits)
for(p = prevp->s.ptr; ; prevp = p, p = p->s.ptr) {
if(p->s.size >= nunits) {
if(p->s.size == nunits)
prevp->s.ptr = p->s.ptr;
else {
p->s.size -= nunits;
......@@ -81,10 +81,10 @@ malloc(uint nbytes)
p->s.size = nunits;
}
freep = prevp;
return (void *) (p + 1);
return (void*) (p + 1);
}
if (p == freep)
if ((p = morecore(nunits)) == 0)
if(p == freep)
if((p = morecore(nunits)) == 0)
return 0;
}
}
user.h
浏览文件 @ 9e9bcaf1
......@@ -7,27 +7,27 @@ int write(int, void*, int);
int read(int, void*, int);
int close(int);
int kill(int);
int exec(char *, char **);
int open(char *, int);
int mknod (char*,short,short,short);
int unlink (char*);
int fstat (int fd, struct stat *stat);
int link(char *, char *);
int mkdir(char *);
int chdir(char *);
int exec(char*, char**);
int open(char*, int);
int mknod(char*, short, short, short);
int unlink(char*);
int fstat(int fd, struct stat*);
int link(char*, char*);
int mkdir(char*);
int chdir(char*);
int dup(int);
int getpid();
char *sbrk(int);
char* sbrk(int);
// ulib.c
int stat(char *, struct stat *stat);
int stat(char*, struct stat*);
int puts(char*);
char* strcpy(char*, char*);
char *strchr(const char *s, char c);
int strcmp(const char *p, const char *q);
void printf(int fd, char *fmt, ...);
char *gets(char *, int max);
unsigned int strlen(char *);
void * memset(void *dst, int c, unsigned int n);
void *malloc(uint);
void free(void *);
char* strchr(const char*, char c);
int strcmp(const char*, const char*);
void printf(int, char*, ...);
char* gets(char*, int max);
unsigned int strlen(char*);
void* memset(void*, int, unsigned int);
void* malloc(uint);
void free(void*);
userfs.c
浏览文件 @ 9e9bcaf1
......@@ -34,7 +34,7 @@ opentest(void)
}
}
void
void
writetest(void)
{
int fd;
......@@ -47,12 +47,12 @@ writetest(void)
printf(stdout, "error: creat small failed!\n");
exit();
}
for (i = 0; i < 100; i++) {
if (write (fd, "aaaaaaaaaa", 10) != 10) {
for(i = 0; i < 100; i++) {
if(write(fd, "aaaaaaaaaa", 10) != 10) {
printf(stdout, "error: write aa %d new file failed\n", i);
exit();
}
if (write (fd, "bbbbbbbbbb", 10) != 10) {
if(write(fd, "bbbbbbbbbb", 10) != 10) {
printf(stdout, "error: write bb %d new file failed\n", i);
exit();
}
......@@ -67,7 +67,7 @@ writetest(void)
exit();
}
i = read(fd, buf, 2000);
if (i == 2000) {
if(i == 2000) {
printf(stdout, "read succeeded\n");
} else {
printf(stdout, "read failed\n");
......@@ -75,13 +75,13 @@ writetest(void)
}
close(fd);
if (unlink("small") < 0) {
if(unlink("small") < 0) {
printf(stdout, "unlink small failed\n");
exit();
}
}
void
void
writetest1(void)
{
int i, fd, n;
......@@ -94,9 +94,9 @@ writetest1(void)
exit();
}
for (i = 0; i < MAXFILE; i++) {
((int *) buf)[0] = i;
if (write (fd, buf, 512) != 512) {
for(i = 0; i < MAXFILE; i++) {
((int*) buf)[0] = i;
if(write(fd, buf, 512) != 512) {
printf(stdout, "error: write big file failed\n", i);
exit();
}
......@@ -111,26 +111,26 @@ writetest1(void)
}
n = 0;
while (1) {
while(1) {
i = read(fd, buf, 512);
if (i == 0) {
if (n == MAXFILE - 1) {
if(i == 0) {
if(n == MAXFILE - 1) {
printf(stdout, "read only %d blocks from big", n);
exit();
}
break;
} else if (i != 512) {
} else if(i != 512) {
printf(stdout, "read failed %d\n", i);
exit();
}
if (((int *)buf)[0] != n) {
printf(stdout, "read content of block %d is %d\n", n, ((int *)buf)[0]);
if(((int*)buf)[0] != n) {
printf(stdout, "read content of block %d is %d\n", n, ((int*)buf)[0]);
exit();
}
n++;
}
close(fd);
if (unlink("big") < 0) {
if(unlink("big") < 0) {
printf(stdout, "unlink big failed\n");
exit();
}
......@@ -145,14 +145,14 @@ createtest(void)
name[0] = 'a';
name[2] = '\0';
for (i = 0; i < 52; i++) {
for(i = 0; i < 52; i++) {
name[1] = '0' + i;
fd = open(name, O_CREATE|O_RDWR);
close(fd);
}
name[0] = 'a';
name[2] = '\0';
for (i = 0; i < 52; i++) {
for(i = 0; i < 52; i++) {
name[1] = '0' + i;
unlink(name);
}
......@@ -162,22 +162,22 @@ void dirtest(void)
{
printf(stdout, "mkdir\n");
if (mkdir("dir0") < 0) {
if(mkdir("dir0") < 0) {
printf(stdout, "mkdir failed\n");
exit();
}
if (chdir("dir0") < 0) {
if(chdir("dir0") < 0) {
printf(stdout, "chdir dir0 failed\n");
exit();
}
if (chdir("..") < 0) {
if(chdir("..") < 0) {
printf(stdout, "chdir .. failed\n");
exit ();
exit();
}
if (unlink("dir0") < 0) {
if(unlink("dir0") < 0) {
printf(stdout, "unlink dir0 failed\n");
exit();
}
......@@ -186,11 +186,11 @@ void dirtest(void)
void
exectest(void)
{
if (exec("echo", echo_args) < 0) {
if(exec("echo", echo_args) < 0) {
printf(stdout, "exec echo failed\n");
exit();
}
if (exec("cat", cat_args) < 0) {
if(exec("cat", cat_args) < 0) {
printf(stdout, "exec cat failed\n");
exit();
}
......
usertests.c
浏览文件 @ 9e9bcaf1
......@@ -67,7 +67,7 @@ preempt(void)
if(pid1 == 0)
for(;;)
;
pid2 = fork();
if(pid2 == 0)
for(;;)
......@@ -131,17 +131,17 @@ mem(void)
if((pid = fork()) == 0){
m1 = 0;
while ((m2 = malloc(10001)) != 0) {
*(char **) m2 = m1;
while((m2 = malloc(10001)) != 0) {
*(char**) m2 = m1;
m1 = m2;
}
while (m1) {
m2 = *(char **)m1;
while(m1) {
m2 = *(char**)m1;
free(m1);
m1 = m2;
}
m1 = malloc(1024*20);
if (m1 == 0) {
if(m1 == 0) {
puts("couldn't allocate mem?!!\n");
exit();
}
......
usys.S
浏览文件 @ 9e9bcaf1
......@@ -6,7 +6,7 @@
name: \
movl $SYS_ ## name, %eax; \
int $T_SYSCALL; \
ret
ret
STUB(fork)
STUB(exit)
......
x86.h
浏览文件 @ 9e9bcaf1
......@@ -42,7 +42,7 @@ static __inline void
lgdt(struct segdesc *p, int size)
{
volatile ushort pd[3];
pd[0] = size-1;
pd[1] = (uint)p;
pd[2] = (uint)p >> 16;
......@@ -56,11 +56,11 @@ static __inline void
lidt(struct gatedesc *p, int size)
{
volatile ushort pd[3];
pd[0] = size-1;
pd[1] = (uint)p;
pd[2] = (uint)p >> 16;
asm volatile("lidt (%0)" : : "g" (pd));
}
......@@ -91,13 +91,13 @@ cpuid(uint info, uint *eaxp, uint *ebxp, uint *ecxp, uint *edxp)
asm volatile("cpuid" :
"=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) :
"a" (info));
if (eaxp)
if(eaxp)
*eaxp = eax;
if (ebxp)
if(ebxp)
*ebxp = ebx;
if (ecxp)
if(ecxp)
*ecxp = ecx;
if (edxp)
if(edxp)
*edxp = edx;
}
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论