From b96f58792170448e8f9b5a424d98ba26c1c34506 Mon Sep 17 00:00:00 2001
From: Elaina Claus <elaina.claus@chtm.me>
Date: Thu, 3 Oct 2024 19:53:11 -0400
Subject: [PATCH] add forked functions and remove from memory.inc for kmem*

---
 include/memory.inc     | 37 +------------------------------------
 src/mbr/mbr.nasm       |  1 +
 src/stage2/stage2.nasm |  1 +
 src/vbr/vbr.nasm       |  1 +
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/include/memory.inc b/include/memory.inc
index f9d157e..eb8ae11 100755
--- a/include/memory.inc
+++ b/include/memory.inc
@@ -254,39 +254,4 @@ endstruc
     DEBUG_LOOP:
         hlt
         jmp short DEBUG_LOOP
-%endmacro
-
-
-; uint8_t* kmemset(void* dest, uint8_t val, size_t len);
-kmemset:
-    push    di             ; function uses di, so save it.
- 
-    mov     cx, [bp - 2]   ; size_t len
-    mov     al, [bp - 4]   ; uint8_t val
-    mov     di, [bp - 6]   ; void * ptr
-
-    cld
-    rep     stosb 
-.endf:
-    mov     ax, [bp - 6]  ; return pointer to dest
-    pop     di            ; restore di
-    ret
-
-; uint8_t* kmemset(uint8_t* dest, uint8_t* src, size_t len);
-; not overlap safe
-kmemcpy:
-    push di
-    push si                 ; di, si are callee save
-
-    mov cx, [bp - 2]        ; length
-    mov si, [bp - 4]        ; source
-    mov di, [bp - 6]        ; dest
-    
-    cld                     ; ensure we are incrementing
-    rep movsb
-
-.endf:
-    mov ax, [bp - 6]        ; return pointer to dest
-    pop si
-    pop di
-    ret
\ No newline at end of file
+%endmacro
\ No newline at end of file
diff --git a/src/mbr/mbr.nasm b/src/mbr/mbr.nasm
index c6b57e4..268e3f5 100755
--- a/src/mbr/mbr.nasm
+++ b/src/mbr/mbr.nasm
@@ -47,6 +47,7 @@ init:
 
 %include "config.inc"
 %include "memory.inc"
+%include "kmem_func_OLD.inc"
 %include "partition_table.inc"
 %include "errors.inc"
 
diff --git a/src/stage2/stage2.nasm b/src/stage2/stage2.nasm
index 822b234..44684dd 100755
--- a/src/stage2/stage2.nasm
+++ b/src/stage2/stage2.nasm
@@ -53,6 +53,7 @@ init:
 %include "config.inc"
 %include "errors.inc"
 %include "memory.inc"
+%include "kmem_func.inc"
 %include "partition_table.inc"
 %include "cdecl16.inc"
 
diff --git a/src/vbr/vbr.nasm b/src/vbr/vbr.nasm
index 4025cb1..b036ad6 100755
--- a/src/vbr/vbr.nasm
+++ b/src/vbr/vbr.nasm
@@ -46,6 +46,7 @@ init:
 
 %include "config.inc"
 %include "memory.inc"
+%include "kmem_func_OLD.inc"
 %include "partition_table.inc"
 %include "errors.inc"