git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2-setup_gdt.md (#22)
[lunaix-os.git]
/
lunaix-os
/
libs
/
klibc
/
string
/
mem.c
diff --git
a/lunaix-os/libs/klibc/string/mem.c
b/lunaix-os/libs/klibc/string/mem.c
index ae56240eed91511c08a912b919bff04b84324866..08563581f19119172b960067de30094d0ff69a1a 100755
(executable)
--- a/
lunaix-os/libs/klibc/string/mem.c
+++ b/
lunaix-os/libs/klibc/string/mem.c
@@
-1,8
+1,8
@@
#include <klibc/string.h>
#include <klibc/string.h>
-#include <
stdint
.h>
+#include <
lunaix/types
.h>
void*
void*
-memcpy(void* dest, const void* src,
size_t
num)
+memcpy(void* dest, const void* src,
unsigned long
num)
{
if (!num)
return dest;
{
if (!num)
return dest;
@@
-15,16
+15,16
@@
memcpy(void* dest, const void* src, size_t num)
}
void*
}
void*
-memmove(void* dest, const void* src,
size_t
num)
+memmove(void* dest, const void* src,
unsigned long
num)
{
{
- u
int8_t* dest_ptr = (uint
8_t*)dest;
- const u
int8_t* src_ptr = (const uint
8_t*)src;
+ u
8_t* dest_ptr = (u
8_t*)dest;
+ const u
8_t* src_ptr = (const u
8_t*)src;
if (dest_ptr < src_ptr) {
if (dest_ptr < src_ptr) {
- for (
size_t
i = 0; i < num; i++) {
+ for (
unsigned long
i = 0; i < num; i++) {
*(dest_ptr + i) = *(src_ptr + i);
}
} else {
*(dest_ptr + i) = *(src_ptr + i);
}
} else {
- for (
size_t
i = num; i != 0; i--) {
+ for (
unsigned long
i = num; i != 0; i--) {
*(dest_ptr + i - 1) = *(src_ptr + i - 1);
}
}
*(dest_ptr + i - 1) = *(src_ptr + i - 1);
}
}
@@
-32,7
+32,7
@@
memmove(void* dest, const void* src, size_t num)
}
void*
}
void*
-memset(void* ptr, int value,
size_t
num)
+memset(void* ptr, int value,
unsigned long
num)
{
asm volatile("movl %1, %%edi\n"
"rep stosb\n" ::"c"(num),
{
asm volatile("movl %1, %%edi\n"
"rep stosb\n" ::"c"(num),
@@
-43,11
+43,11
@@
memset(void* ptr, int value, size_t num)
}
int
}
int
-memcmp(const void* ptr1, const void* ptr2,
size_t
num)
+memcmp(const void* ptr1, const void* ptr2,
unsigned long
num)
{
{
- u
int8_t* p1 = (uint
8_t*)ptr1;
- u
int8_t* p2 = (uint
8_t*)ptr2;
- for (
size_t
i = 0; i < num; i++) {
+ u
8_t* p1 = (u
8_t*)ptr1;
+ u
8_t* p2 = (u
8_t*)ptr2;
+ for (
unsigned long
i = 0; i < num; i++) {
int diff = *(p1 + i) - *(p2 + i);
if (diff != 0) {
return diff;
int diff = *(p1 + i) - *(p2 + i);
if (diff != 0) {
return diff;