Changeset 415

Timestamp:

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

Author:

krobillard

Message:

Debugger works again.

Location:

branches/thune/thread_safe

Files:

• debugger/StackDisplay.cpp (modified) (1 diff)
• debugger/ThuneDebugger.cpp (modified) (10 diffs)
• debugger/ThuneDebugger.h (modified) (3 diffs)
• debugger/project.r (modified) (1 diff)
• doc/UserManual (modified) (2 diffs)
• env.h (modified) (1 diff)
• thune.c (modified) (2 diffs)

branches/thune/thread_safe/debugger/StackDisplay.cpp

@@ -15 +15 @@
    Show current stack.
 */
-void StackDisplay::update( UThread* ur_thread, UString* tmp )
+void StackDisplay::update( UThread* ut, UString* tmp )
 {
     clear();
 
-    if( ur_env )
+    if( ut )
     {
         UCell* it = UR_TOS;

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 );
 

branches/thune/thread_safe/debugger/ThuneDebugger.h

@@ -7 +7 @@
 
 #include <QMainWindow>
-#include "urlan.h"
+#include "env.h"
 
 
@@ -59 +59 @@
     QString strippedName(const QString &fullFileName);
 
-    static int monitorIgnore( int cmd, UCell* pc, UCell* end );
-    static int monitorRun( int cmd, UCell* pc, UCell* end );
-    static int monitorStep( int cmd, UCell* pc, UCell* end );
+    static int monitorIgnore( UThread*, int cmd, UCell* pc, UCell* end );
+    static int monitorRun   ( UThread*, int cmd, UCell* pc, UCell* end );
+    static int monitorStep  ( UThread*, int cmd, UCell* pc, UCell* end );
 
     void showPC( UThread*, UCell* pc, UCell* end );
@@ -94 +94 @@
     QEventLoop* _loop;
     UrlanEnv _env;
-    UIndex _tmpStrN;
-    UIndex _tmpStrHold;
 
     enum

branches/thune/thread_safe/debugger/project.r

@@ -11 +11 @@
 
     include_from %..
-    libs_from %../ %thune0
+    libs_from %../ %thune_emh
 
-    cflags "-DUR_CONFIG_EMH"
+    cflags "-DLANG_THUNE -DUR_CONFIG_EMH"
 
     linux [
         ;libs_from %/usr/X11R6/lib64
         ;  {SM Xinerama Xext Xrandr Xrender Xcursor Xi Xft X11}
+        include_from %../unix
+        libs {bz2}
         libs {png freetype dl}
     ]

branches/thune/thread_safe/doc/UserManual

@@ -75 +75 @@
 block!       []  [a b c]
 paren!       ()  (a b c)
+macro!       <size 2 mul>
 vector!      #[1 2 3]  #[-85.33 2 44.8]
 function!    [2 add] proc :inc2
@@ -91 +92 @@
 context!
 ===========  ==========
+
+
+Macros
+------
+
+Reader macros are simply blocks of code evaluated by the tokenizer.
+Any reduced values created by the evaluation are appended to the block
+currently being read.
+
+Macros can be used wherever a constant is needed to improve evaluation
+speed.
+
+Example::
+
+    <34 2 mul :border>
+
+    box-width <border> add
+
+
+Currently, macro! values cannot be created by the user.
+A literal macro syntax may be added in the future.
 
 

branches/thune/thread_safe/env.h

@@ -33 +33 @@
     OSMutex     mutex;
 #ifdef UR_CONFIG_EMH
-    int (*monitor)(int,UCell*,UCell*);
+    int (*monitor)(UThread*,int,UCell*,UCell*);
 #endif
 };

branches/thune/thread_safe/thune.c

@@ -284 +284 @@
 #ifdef UR_CONFIG_EMH
 #define EMH_STEP(pc,end) \
-    if( ut->env->monitor(UR_EMH_STEP,pc,end) ) \
+    if( ut->env->monitor(ut,UR_EMH_STEP,pc,end) ) \
         goto call_return;
 
 #define EMH_HALT(pc,end) \
-    if( ! ut->env->monitor(UR_EMH_HALT,pc,end) ) \
+    if( ! ut->env->monitor(ut,UR_EMH_HALT,pc,end) ) \
         goto execute;
 #else
@@ -769 +769 @@
         case UT_CALL:
             val->call.addr( ut, UR_TOS );
-#ifdef UR_CONFIG_DT_CODE
+#if defined(UR_CONFIG_EMH) || defined(UR_CONFIG_DT_CODE)
 call_return:
 #endif