Merge branch 'master' into patch-anon-vma

This commit is contained in:
fslongjin 2022-08-14 21:42:50 +08:00
commit daf8732bbd
4 changed files with 18 additions and 5 deletions

3
.gitignore vendored
View File

@ -9,4 +9,5 @@ kernel/kernel
serial_opt.txt serial_opt.txt
user/sys_api_lib user/sys_api_lib
docs/_build docs/_build
draft

View File

@ -120,7 +120,8 @@
"screen_manager.h": "c", "screen_manager.h": "c",
"textui.h": "c", "textui.h": "c",
"atomic.h": "c", "atomic.h": "c",
"uart.h": "c" "uart.h": "c",
"fat_ent.h": "c"
}, },
"C_Cpp.errorSquiggles": "Enabled", "C_Cpp.errorSquiggles": "Enabled",
"esbonio.sphinx.confDir": "" "esbonio.sphinx.confDir": ""

View File

@ -3,8 +3,19 @@
int64_t pow(int64_t x, int y) int64_t pow(int64_t x, int y)
{ {
if (y == 0)
return 1;
if (y == 1)
return x;
if (y == 2)
return x * x;
int64_t res = 1; int64_t res = 1;
for (int i = 0; i < y; ++i) while (y != 0)
res *= x; {
if (y & 1)
res *= x;
y >>= 1;
x *= x;
}
return res; return res;
} }

View File

@ -345,7 +345,7 @@ void fat32_fill_shortname(struct vfs_dir_entry_t *dEntry, struct fat32_Directory
} }
else else
{ {
for(int j = 8;j<11;++j) for (int j = 8; j < 11; ++j)
{ {
target->DIR_Name[j] = 'a'; target->DIR_Name[j] = 'a';
} }