From a04d40c6d54762969e12b3e1a3e159b912124525 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Tue, 22 Sep 2009 11:52:30 +0800 Subject: [PATCH] Wrapping fix in vterm, increased verbosity of MM_Allocate --- Kernel/arch/x86/mm_virt.c | 2 +- Kernel/drv/vterm.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c index b03d8473..cdd071c0 100644 --- 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 8aa7321b..d8c3039a 100644 --- 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; -- 2.20.1