Changeset 415 for branches/thune/thread_safe/debugger/ThuneDebugger.cpp

Timestamp:

06/16/07 22:57:20 (17 months ago)

Author:

krobillard

Message:

Debugger works again.

Files:

• branches/thune/thread_safe/debugger/ThuneDebugger.cpp (modified) (10 diffs)

branches/thune/thread_safe/debugger/ThuneDebugger.cpp

@@ -24 +24 @@
 
     _mode = kModeVoid;
+    _env.threads = 0;
 
     _loop = new QEventLoop( this );
@@ -484 +485 @@
 
 
-void ThuneDebugger::showPC( UThread* ur_thread, UCell* pc, UCell* end )
-{
-    UString* str = ur_binPtr( _tmpStrN );
+void ThuneDebugger::showPC( UThread* ut, UCell* pc, UCell* end )
+{
+    UString* str = ur_threadTmp( ut );
 
     ur_arrayReserve( str, 1, 4 );
@@ -515 +516 @@
     _console->append( str->ptr.c );
 
-    _stack->update( ur_thread, str );
-}
-
-
-int ThuneDebugger::monitorIgnore( int, UCell*, UCell* )
+    _stack->update( ut, str );
+}
+
+
+int ThuneDebugger::monitorIgnore( UThread*, int, UCell*, UCell* )
 {
     return 0;
@@ -525 +526 @@
 
 
-int ThuneDebugger::monitorRun( int cmd, UCell* pc, UCell* end )
-{
-    UThread* ur_thread = &ur_env->mainThread;
-
+int ThuneDebugger::monitorRun( UThread* ut, int cmd, UCell* pc, UCell* end )
+{
     switch( cmd )
     {
@@ -547 +546 @@
             gDB->setMode( kModeStep );
 
-            gDB->showPC( ur_thread, pc, end );
+            gDB->showPC( ut, pc, end );
             int ret = gDB->_loop->exec();
             if( ret < 0 )
@@ -560 +559 @@
 
 
-int ThuneDebugger::monitorStep( int cmd, UCell* pc, UCell* end )
-{
-    UThread* ur_thread = &ur_env->mainThread;
-
+int ThuneDebugger::monitorStep( UThread* ut, int cmd, UCell* pc, UCell* end )
+{
     switch( cmd )
     {
         case UR_EMH_STEP:
-            gDB->showPC( ur_thread, pc, end );
+            gDB->showPC( ut, pc, end );
             int ret = gDB->_loop->exec();
             //printf( "KR ret %d\n", ret );
@@ -641 +638 @@
     _env.monitor = monitorIgnore;
 
-    if( ur_startup( &_env ) )
+    if( ur_startup( &_env, 0, 0 ) )
         return false;
 
-    _tmpStrN = ur_makeBinary( 256 );
-    _tmpStrHold = ur_hold( UT_STRING, _tmpStrN );
-
     return true;
 }
@@ -653 +647 @@
 void ThuneDebugger::destroyEnv()
 {
-    if( ur_env )
+    if( _env.threads )
         ur_shutdown( &_env );
 }
@@ -662 +656 @@
     UCell* res;
     QByteArray cmd;
-    UThread* ur_thread = &ur_env->mainThread;
+    UThread* ut = _env.threads;
 
     cmd = _editor->toPlainText().toAscii();
 
-    switch( ur_evalCStr( ur_thread, cmd, cmd.size() ) )
+    switch( ur_evalCStr( ut, cmd, cmd.size() ) )
     {
         case UR_EVAL_OK:
         {
-            res = ur_result( ur_thread, 0 );
+            res = ur_result( ut, 0 );
 
             if( ! ur_is(res, UT_UNSET) &&
@@ -707 +701 @@
             UString* str;
 
-            res = ur_result( ur_thread, 0 );
+            res = ur_result( ut, 0 );
             str = ur_binPtr( res->err.messageStr );