mathieu/matos
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add user file size before the file

Browse Source 
As a quick fix before FS support
This commit is contained in:
Mathieu Maret 2021-11-08 22:33:15 +01:00
parent 9e528320cf
commit 08a9d7442e
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -45,7 +45,8 @@ disk.img: disk.sfdisk userspace
sfdisk $@ < $< sfdisk $@ < $<
# Before having filesystem support, just dump the user prog into the first partition # Before having filesystem support, just dump the user prog into the first partition
strip userspace/user -o userspace/user.strip strip userspace/user -o userspace/user.strip
dd if=userspace/user.strip of=disk.img seek=2048 bs=512 $(eval file_size:=$(shell du -b userspace/user.strip|awk '{print $$1}' | xargs printf "%016d" )) \
sed '1s/^/$(file_size)/' userspace/user.strip | dd of=disk.img seek=2048 bs=512
# NASM without preprocessing # NASM without preprocessing
%.o:%.asm %.o:%.asm

28
core/main.c
View File

@ -215,6 +215,8 @@ static uaddr_t loadElfProg(const char *prog)
return elf_hdr->e_entry; return elf_hdr->e_entry;
} }
#define FILE_HEADER_SIZE 16
#define FILE_MAX_SIZE 64
void loadUserSpace() void loadUserSpace()
{ {
struct ata_partition *part = ATAGetPartition(0); struct ata_partition *part = ATAGetPartition(0);
@ -224,13 +226,33 @@ void loadUserSpace()
return; return;
} }
char *buf = malloc(26 * 512); char *buf = malloc(FILE_MAX_SIZE * 512);
if (buf == NULL) { if (buf == NULL) {
printf("ENOMEM\n"); printf("ENOMEM\n");
return; return;
} }
if (ATAReadPartitionSector(part, 0, 26, buf)) { if (ATAReadPartitionSector(part, 0, 1, buf)) {
printf("Fail to read from disk\n");
return;
}
int sectorToRead;
{
char size[FILE_HEADER_SIZE + 1];
memcpy(size, buf, FILE_HEADER_SIZE);
size[FILE_HEADER_SIZE] = '\0';
int sizeInt = atoi(size);
sectorToRead = DIV_ROUND_UP(sizeInt, DISK_SECTOR_SIZE) - 1;
}
if (sectorToRead > FILE_MAX_SIZE - 1) {
printf("File too long");
return;
}
if (ATAReadPartitionSector(part, 1, sectorToRead,
buf + DISK_SECTOR_SIZE)) {
printf("Fail to read from disk\n"); printf("Fail to read from disk\n");
return; return;
} }
@ -238,7 +260,7 @@ void loadUserSpace()
struct process *proc = processCreate("UserSpace"); struct process *proc = processCreate("UserSpace");
threadChangeCurrentContext(processGetMMUContext(proc)); threadChangeCurrentContext(processGetMMUContext(proc));
uaddr_t prog = loadElfProg(buf); uaddr_t prog = loadElfProg(buf + FILE_HEADER_SIZE);
if (prog == (uaddr_t)NULL) { if (prog == (uaddr_t)NULL) {
free(buf); free(buf);
return; return;