ytshih/afs2026-hw1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: use 1 based instead of 0 based fileid

Browse Source
This commit is contained in:
Yi-Ting Shih
2026-04-06 21:47:10 +08:00
parent 69f2502823
commit a71e244a60
6 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/Makefile
View File

@@ -1,13 +1,11 @@
.PHONY: all clean run
.PHONY: all clean
all:
make -C build.linux depend
make -C build.linux -j 16
make -C test -j 16
make -C test run
clean:
make -C build.linux distclean
make -C test distclean
run:
make -C test run

5
code/test/Makefile.dep
View File

@@ -20,14 +20,15 @@ hosttype = unknown
# !!! ADD PATH TO CPP and CROSS COMPILER
ifeq ($(osname),Linux)
# full path name of your cpp program i.e.:
# full path name of your cpp program i.e.:
CPP = ../../usr/local/nachos/lib/gcc-lib/decstation-ultrix/2.95.2/cpp
# directory in which your gcc cross-compiler lives i.e.:
# directory in which your gcc cross-compiler lives i.e.:
GCCDIR = ../../usr/local/nachos/bin/decstation-ultrix-
LDFLAGS = -T script -N
ASFLAGS = -mips2
CPPFLAGS = $(INCDIR)
COFF2NOFF = ../../coff2noff/coff2noff.x86Linux
NACHOS = ../build.linux/nachos
hosttype = x86Linux
endif

25
code/userprog/ksyscall.h
View File

@@ -41,36 +41,37 @@ void SysPrintInt(int value) {
}
OpenFileId SysOpen(char *name) {
OpenFileId id = -1;
for (int i = 0; i < 20; i++)
if (kernel->fileSystem->fileDescriptorTable[i] == NULL) {
id = i;
kernel->fileSystem->fileDescriptorTable[i]
kernel->fileSystem->fileDescriptorTable[i]
= kernel->fileSystem->Open(name);
if (kernel->fileSystem->fileDescriptorTable[i] == NULL)
return -1;
break;
return i + 1; // OpenFileId starts from 1
}
return id;
return -1;
}
int SysWrite(char *buffer, int size, OpenFileId id) {
if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
int idx = id - 1; // Convert 1-based id to 0-based index
if (idx < 0 || idx >= 20 || kernel->fileSystem->fileDescriptorTable[idx] == NULL)
return -1;
return kernel->fileSystem->fileDescriptorTable[id]->Write(buffer, size);
return kernel->fileSystem->fileDescriptorTable[idx]->Write(buffer, size);
}
int SysRead(char *buffer, int size, OpenFileId id) {
if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
int idx = id - 1; // Convert 1-based id to 0-based index
if (idx < 0 || idx >= 20 || kernel->fileSystem->fileDescriptorTable[idx] == NULL)
return -1;
return kernel->fileSystem->fileDescriptorTable[id]->Read(buffer, size);
return kernel->fileSystem->fileDescriptorTable[idx]->Read(buffer, size);
}
int SysClose(OpenFileId id) {
if (id < 0 || id >= 20 || kernel->fileSystem->fileDescriptorTable[id] == NULL)
int idx = id - 1; // Convert 1-based id to 0-based index
if (idx < 0 || idx >= 20 || kernel->fileSystem->fileDescriptorTable[idx] == NULL)
return 0;
delete kernel->fileSystem->fileDescriptorTable[id];
kernel->fileSystem->fileDescriptorTable[id] = NULL;
delete kernel->fileSystem->fileDescriptorTable[idx];
kernel->fileSystem->fileDescriptorTable[idx] = NULL;
return 1;
}