improved formatting of traceback

SVN=123527

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 73ae1972e2cbe5d479099858f57e53751998abf8..f26dacf22f05531b026eaaf29412b96c2d1ee95e 100644 (file)
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -110,6 +110,7 @@ sys_panicl(int32 lno)
        int8* spp;
        int32 counter;
        int32 i;
+       int8* name;
 
        prints("\npanic on line ");
        sys_printint(lno);
@@ -119,18 +120,29 @@ sys_panicl(int32 lno)
        sp = (uint8*)&lno;
        pc = (uint8*)sys_panicl;
        counter = 0;
+       name = "panic";
        while((pc = ((uint8**)sp)[-1]) > (uint8*)0x1000) {
+               /* print args for this frame */
+               prints("\t");
+               prints(name);
+               prints("(");
                for(i = 0; i < 3; i++){
-                       prints("\tint32[");
-                       sys_printint(i);
-                       prints("]=");
+                       if(i != 0)
+                               prints(", ");
                        sys_printint(((uint32*)sp)[i]);
-                       prints("\tint64*[");
-                       sys_printint(i);
-                       prints("]=");
+               }
+               prints(", ...)\n");
+               prints("\t");
+               prints(name);
+               prints("(");
+               for(i = 0; i < 3; i++){
+                       if(i != 0)
+                               prints(", ");
+                       prints("0x");
                        sys_printpointer(((void**)sp)[i]);
-                       prints("\n");
                }
+               prints(", ...)\n");
+               /* print pc for next frame */
                prints("0x");
                sys_printpointer(pc);
                prints(" ");
@@ -144,7 +156,8 @@ sys_panicl(int32 lno)
                                spoff = *pc++;
                                spoff += *pc++ << 8;
                                spoff += *pc++ << 16;
-                               prints((int8*)pc);
+                               name = (int8*)pc;
+                               prints(name);
                                prints("+");
                                sys_printint(pc-retpc);
                                prints("?zi\n");