diff --git a/src/sys/kernel/fork.c b/src/sys/kernel/fork.c index 8a635bf..5e49c3b 100644 --- a/src/sys/kernel/fork.c +++ b/src/sys/kernel/fork.c @@ -47,17 +47,17 @@ asm( ".globl sysFork \n" "sysFork: \n" - " xor %eax,%eax \n" - " call schedNewTask \n" + " xor %eax,%eax \n" + " call schedNewTask \n" " testl %eax,%eax \n" " je 1f \n" " pushl %esi \n" " pushl %edi \n" " pushl %ebp \n" " pushl %eax \n" - " call forkCopyProcess \n" - " movl %eax,(%ebx) \n" - " addl $16,%esp \n" + " call forkCopyProcess \n" + " movl %eax,(%ebx) \n" + " addl $16,%esp \n" "1: \n" " ret \n" ); @@ -107,6 +107,9 @@ /*** $Log$ + Revision 1.8 2004/07/17 03:32:22 reddawg + assert() + Revision 1.7 2004/07/17 03:10:18 reddawg Added asserts no problems thusfar diff --git a/src/sys/kernel/spinlock.c b/src/sys/kernel/spinlock.c index ea1480c..d376299 100644 --- a/src/sys/kernel/spinlock.c +++ b/src/sys/kernel/spinlock.c @@ -37,7 +37,7 @@ inline void spinUnlock(spinLock_t *lock) { register int unlocked; assert(lock); - __asm__ __volatile ( + asm volatile( "xchgl %0, %1" : "=&r" (unlocked), "=m" (*lock) : "0" (0) ); @@ -46,7 +46,7 @@ inline int spinTryLock(spinLock_t *lock) { register int locked; assert(lock); - __asm__ __volatile ("xchgl %0, %1" + asm volatile"xchgl %0, %1" : "=&r" (locked), "=m" (*lock) : "0" (1) ); return(!locked); @@ -66,6 +66,11 @@ /*** $Log$ + Revision 1.5 2004/07/17 16:43:10 reddawg + shell: fixed stress testing + ubistry: fixed some segfaults + spinlock: added assert() + Revision 1.4 2004/05/21 12:42:32 reddawg Cleaned Up diff --git a/src/sys/lib/kprintf.c b/src/sys/lib/kprintf.c index d8c6754..46b4877 100644 --- a/src/sys/lib/kprintf.c +++ b/src/sys/lib/kprintf.c @@ -23,18 +23,6 @@ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $Log$ - Revision 1.2 2004/07/17 01:30:52 reddawg - assert: you have assert I believe - - Revision 1.1.1.1 2004/04/15 12:07:10 reddawg - UbixOS v1.0 - - Revision 1.13 2004/04/13 16:36:33 reddawg - Changed our copyright, it is all now under a BSD-Style license - - - $Id$ *****************************************************************************************/ @@ -99,5 +87,18 @@ } /*** + $Log$ + Revision 1.3 2004/07/17 02:45:55 reddawg + Modified assert it now invokes kPanic it is very nifty + + Revision 1.2 2004/07/17 01:30:52 reddawg + assert: you have assert I believe + + Revision 1.1.1.1 2004/04/15 12:07:10 reddawg + UbixOS v1.0 + + Revision 1.13 2004/04/13 16:36:33 reddawg + Changed our copyright, it is all now under a BSD-Style license + END ***/