KAAAsS/ChCore-exercise
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "memcpy 复现"

Browse Source 
This reverts commit 54f32e597f03b38978c4ddf551e11cbb6e7e954b.
This commit is contained in:
KAAAsS 2022-04-21 22:58:02 +08:00
parent 54f32e597f
commit 21ac9ce01e
Signed by: KAAAsS
GPG Key ID: D22F53AF662411FE
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lab5/user/lab5/apps/init.c
View File

@ -418,14 +418,6 @@ int fs_read(char *path, off_t offset, ssize_t count) {
return ret;
}
void memcpy2(void *dst, const void *src, u64 len)
{
u64 i = 0;
for (; i < len; i += 1) {
((u8 *) dst)[i] = ((u8 *) src)[i];
}
}
/**
* 读入文件并返回长度
*/
@ -462,16 +454,8 @@ int fs_read_all(char *path, void **ret_buf)
return cur;
}
// FIXME: 此处在 Release 模式下第一次读取前 16 字节为空
// memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
printf("first bytes: %c %c\n", ((u8*) TMPFS_READ_BUF_VADDR)[0],
((u8*) TMPFS_READ_BUF_VADDR)[1]);
printf("memcpy %x %x %d\n", buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
memcpy2(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
// u64 i = 0;
// for (; i < cur; i += 1) {
// ((u8 *) buf)[i] = ((u8 *) TMPFS_READ_BUF_VADDR)[i];
// }
memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
memcpy(buf, (const void *) TMPFS_READ_BUF_VADDR, cur);
pos += cur;
buf += cur;
}

2
lab5/user/lab5/apps/init_test.c
View File

@ -43,8 +43,6 @@ int main()
usys_fs_load_cpio(CPIO_BIN);
boot_fs();
builtin_cmd("cat tar/cat_test.txt");
return 0;
test_readline();
test_echo();

1
lab5/user/lib/string.c
View File

@ -1,5 +1,4 @@
#include <lib/type.h>
#include "print.h"
/*
* A very shabby implementation, optimize it if you like.