diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 4cd9c7d..ec4885a 100644 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -202,8 +202,10 @@ Allocate Memory Im Going To Have To Make This Load Memory With Correct Settings so it helps us in the future */ - for (x=0;x<=((programHeader[i].phMemsz & 0xFFFFF000)+4095);x+=4096) { - vmmRemapPage(vmmFindFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x)); + for (x=0;x<=((programHeader[i].phMemsz & 0xFFFFF000)+4095);x += 0x100) { + if (vmmRemapPage(vmmFindFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x)) == 0x0) { + kpanic("Error: vmmFindFreePage Failed\n"); + } } _current->oInfo.vmStart = ((programHeader[i].phVaddr & 0xFFFFF000) + 0x1900000); /* Now Load Section To Memory */ @@ -455,6 +457,9 @@ /*** $Log$ + Revision 1.11 2004/05/22 02:10:42 reddawg + Added Code To Debug ISsue + Revision 1.10 2004/05/21 21:15:04 reddawg Fixed a few bugs which prevented the system from loadin diff --git a/src/sys/vmm/paging.c b/src/sys/vmm/paging.c index 5904d21..afa0b56 100644 --- a/src/sys/vmm/paging.c +++ b/src/sys/vmm/paging.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.1.1.1 2004/04/15 12:06:52 reddawg + UbixOS v1.0 + Revision 1.30 2004/04/13 16:36:34 reddawg Changed our copyright, it is all now under a BSD-Style license @@ -207,7 +210,7 @@ "movl %eax,%cr3\n" ); /* Return */ - return (0); + return (source); } /************************************************************************