Wrapping fix in vterm, increased verbosity of MM_Allocate

diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c
index b03d847..cdd071c 100644 (file)
--- a/Kernel/arch/x86/mm_virt.c
+++ b/Kernel/arch/x86/mm_virt.c
@@ -212,7 +212,7 @@ tPAddr MM_Allocate(Uint VAddr)
        }
        // Check if the page is already allocated
        else if( gaPageTable[ VAddr >> 12 ] != 0 ) {
-               Warning("MM_Allocate - Allocating to used address");
+               Warning("MM_Allocate - Allocating to used address (%p)", VAddr);
                return gaPageTable[ VAddr >> 12 ] & ~0xFFF;
        }
        

diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 8aa7321..d8c3039 100644 (file)
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -247,6 +247,7 @@ Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
                                LOG("WriteUTF8(%p, 0x%x)", Buffer+pos, term->InputBuffer[term->InputRead]);
                                pos += WriteUTF8(Buffer+pos, term->InputBuffer[term->InputRead]);
                                term->InputRead ++;
+                               term->InputRead %= MAX_INPUT_CHARS;
                        }
                }
                break;
@@ -260,6 +261,7 @@ Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
                                ((Uint32*)Buffer)[pos] = term->InputBuffer[term->InputRead];
                                pos ++;
                                term->InputRead ++;
+                               term->InputRead %= MAX_INPUT_CHARS;
                        }
                }
                break;