[kaffe] CVS kaffe (jim): Update some gdb macros.

[Kaffe CVS]

PatchSet 4018 
Date: 2003/09/05 00:04:52
Author: jim
Branch: HEAD
Tag: (none) 
Log:
Update some gdb macros.

Members: 
	ChangeLog:1.1614->1.1615 
	developers/gdbinit:1.12->1.13 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1614 kaffe/ChangeLog:1.1615
--- kaffe/ChangeLog:1.1614	Thu Sep  4 18:00:28 2003
+++ kaffe/ChangeLog	Fri Sep  5 00:04:52 2003
@@ -1,3 +1,8 @@
+2003-09-04  Jim Pick  <jim at kaffe.org>
+
+	* developers/gdbinit:
+	Update some of the gdb macros.
+
 2003-09-04  Dalibor Topic <robilad at kaffe.org>
 
 	* libraries/javalib/bootstrap.classlist:
Index: kaffe/developers/gdbinit
diff -u kaffe/developers/gdbinit:1.12 kaffe/developers/gdbinit:1.13
--- kaffe/developers/gdbinit:1.12	Tue Apr 22 17:40:42 2003
+++ kaffe/developers/gdbinit	Fri Sep  5 00:04:53 2003
@@ -60,13 +60,12 @@
 
 define jthreadInfo
   set $jth = ($arg0)
-  set $jlth = (Hjava_lang_Thread*)($jth->jlThread)
+  set $jlth = (Hjava_lang_Thread*)($jth->localData.jlThread)
   printf "jthread:"
     p $jth
   printf "  .status="
     pjthreadStatus $jth
-  printf ";  .flags=%x", $jth.flags
-  printf ";  .jlThread=%p\n", $jth.jlThread
+  printf ";  .flags=%x\n", $jth.flags
   printf "java.lang.Thread:"
     p $jlth
   printf "  .PrivateInfo=%x", $jlth.PrivateInfo
@@ -284,17 +283,18 @@
   set $doBt = $arg0
 
   printf "Live threads in the system: (jth-current = %p)\n\n", currentJThread
-  set $th = liveThreads
+  set $liveQ = liveThreads
 
-  while $th != 0
+  while $liveQ != 0
 
+    set $th = ((jthread *)$liveQ->element)
     jthreadInfo $th
     if $doBt
        btThread $th
     end
 
     printf "---- ---- ---- ----\n\n"
-    set $th = $th.nextlive
+    set $liveQ = $liveQ.next
   end
   printf "\n"
 end
@@ -323,8 +323,8 @@
      printf "  State = %d; Name = ", $jlth.state
      jlstring $jlth.name
   else
-    if $jth.jlThread != $jlth
-       printf "threadInfo: ERROR $jth.jlThread (%p) != $jlth (%p)\n", $jth.jlThread, $jlth
+    if $jth->localData.jlThread != $jlth
+       printf "threadInfo: ERROR $jth->localData.jlThread (%p) != $jlth (%p)\n", $jth->localData.jlThread, $jlth
     else
        jthreadInfo $jth
     end
@@ -356,7 +356,7 @@
 end
 
 define jlthread
-  p ((Hjava_lang_Thread*)(($arg0)->jlThread))
+  p ((Hjava_lang_Thread*)(($arg0)->localData.jlThread))
 end
 document jlthread
   Print the java-lang-Thread associated with the given JTHREAD ptr.
@@ -506,8 +506,8 @@
   set $th = ((jthread_t)$arg0)
   set $jbuf = (int*)($th.env)
 
-  btThreadBSDjmpbuf $jbuf
-  #btThreadLinuxjmpbuf $jbuf
+  #btThreadBSDjmpbuf $jbuf
+  btThreadLinuxjmpbuf $jbuf
   #btThreadOSKitUnixjmpbuf $jbuf
 end
 document btThread
@@ -663,17 +663,19 @@
 end
 
 define dumpexcchain
-    set $th = ((jthread*)$arg0)
-    set $jth = (Hjava_lang_Thread*)$th.jlThread
-    set $eptr = (vmException*)$jth.exceptPtr
+    set $th = ((jthread *) $arg0)
+    set $jth = (Hjava_lang_Thread *) $th->localData.jlThread
+    set $eptr = (struct VmExceptHandler *) $jth.exceptPtr
     while $eptr != 0
-	printf "%p ", $eptr
+	printf "VmExceptionHandler: %p ", $eptr
 	if $eptr.meth == 1
-	    printf "JNI"
+	    # VMEXCEPTHANDLER_KAFFEJNI_HANDLER
+	    printf "  JNI frame.jni.fp = %p\n", $eptr->frame.jni.fp
 	else
-	    printf "%s.%s", ($eptr.meth).class.name.data, ($eptr.meth).name.data
+	    printf "  %s.%s", ($eptr.meth).class.name.data, ($eptr.meth).name.data
+	    printf "  frame.intrp.pc = %p, frame.intrp.syncobj = %p\n", \
+		$eptr->intrp.pc, $eptr->syncobj
 	end
-	printf " pc = %p, mobj = %p\n", $eptr.pc, $eptr.mobj
 	set $eptr = $eptr.prev
     end
 end