harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arc...@apache.org
Subject svn commit: r373984 - in /incubator/harmony/enhanced/jchevm/libjc: arch/arch_libjc.h arch/i386/i386_libjc.h arch/ppc/ppc_libjc.h signals.c structures.h
Date Wed, 01 Feb 2006 04:13:06 GMT
Author: archie
Date: Tue Jan 31 20:13:02 2006
New Revision: 373984

URL: http://svn.apache.org/viewcvs?rev=373984&view=rev
Log:
More fixes that should have been part of r373688.

Modified:
    incubator/harmony/enhanced/jchevm/libjc/arch/arch_libjc.h
    incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h
    incubator/harmony/enhanced/jchevm/libjc/arch/ppc/ppc_libjc.h
    incubator/harmony/enhanced/jchevm/libjc/signals.c
    incubator/harmony/enhanced/jchevm/libjc/structures.h

Modified: incubator/harmony/enhanced/jchevm/libjc/arch/arch_libjc.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/arch/arch_libjc.h?rev=373984&r1=373983&r2=373984&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/arch/arch_libjc.h (original)
+++ incubator/harmony/enhanced/jchevm/libjc/arch/arch_libjc.h Tue Jan 31 20:13:02 2006
@@ -100,9 +100,9 @@
 memory, etc. See "arch/arch_structures.h".
 
     const void *
-    _jc_jmpbuf_sp(const jmp_buf *buf)
+    _jc_jmpbuf_sp(const sigjmp_buf *buf)
 
-    	Returns the saved stack pointer from a jmp_buf structure.
+    	Returns the saved stack pointer from a sigjmp_buf structure.
 
 */
 
@@ -121,7 +121,7 @@
 				_jc_word *words, _jc_rvalue *retval);
 
 /* Stack pointer functions */
-extern const void	*_jc_jmpbuf_sp(const jmp_buf buf);
+extern const void	*_jc_jmpbuf_sp(const sigjmp_buf buf);
 
 /************************************************************************
  *			Architecture-specific functions			*

Modified: incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h?rev=373984&r1=373983&r2=373984&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h (original)
+++ incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h Tue Jan 31 20:13:02 2006
@@ -48,15 +48,15 @@
 #ifdef __FreeBSD__
 
 extern inline const void *
-_jc_jmpbuf_sp(const jmp_buf buf)
+_jc_jmpbuf_sp(const sigjmp_buf buf)
 {
-	return (const void *)buf[0]._jb[0];
+	return (const void *)buf[0]._sjb[2];
 }
 
 #elif defined(__linux__)
 
 extern inline const void *
-_jc_jmpbuf_sp(const jmp_buf buf)
+_jc_jmpbuf_sp(const sigjmp_buf buf)
 {
 	return (const void *)buf[0].__jmpbuf[4];
 }

Modified: incubator/harmony/enhanced/jchevm/libjc/arch/ppc/ppc_libjc.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/arch/ppc/ppc_libjc.h?rev=373984&r1=373983&r2=373984&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/arch/ppc/ppc_libjc.h (original)
+++ incubator/harmony/enhanced/jchevm/libjc/arch/ppc/ppc_libjc.h Tue Jan 31 20:13:02 2006
@@ -62,7 +62,7 @@
  * @todo Returning NULL to be compile-clean for the moment.
  */
 extern inline const void *
-_jc_jmpbuf_sp(const jmp_buf buf)
+_jc_jmpbuf_sp(const sigjmp_buf buf)
 {
 	fprintf(stderr, "WARNING: call to unimplemented function _jc_jmpbuf_sp(...)\n");
 	exit(0);

Modified: incubator/harmony/enhanced/jchevm/libjc/signals.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/signals.c?rev=373984&r1=373983&r2=373984&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/signals.c (original)
+++ incubator/harmony/enhanced/jchevm/libjc/signals.c Tue Jan 31 20:13:02 2006
@@ -30,10 +30,9 @@
 };
 
 /* Internal functions */
-static void	_jc_signal_action(int sig_num,
-			siginfo_t *info, ucontext_t *uctx);
+static void	_jc_signal_action(int sig_num, siginfo_t *info, void *uctx);
 static void	_jc_signal_fallthrough(int sig_index,
-			siginfo_t *info, ucontext_t *uctx);
+			siginfo_t *info, void *uctx);
 
 /* Internal variables */
 static struct	sigaction _jc_previous[_JC_SIGNAL_MAX];
@@ -100,7 +99,7 @@
  * Handle a signal.
  */
 static void
-_jc_signal_action(int sig_num, siginfo_t *info, ucontext_t *uctx)
+_jc_signal_action(int sig_num, siginfo_t *info, void *uctx)
 {
 	_jc_env *const env = _jc_get_current_env();
 	_jc_jvm *vm = NULL;
@@ -206,7 +205,7 @@
  * Handle a signal by falling through to the previously defined handler.
  */
 static void
-_jc_signal_fallthrough(int sig_index, siginfo_t *info, ucontext_t *uctx)
+_jc_signal_fallthrough(int sig_index, siginfo_t *info, void *uctx)
 {
 	struct sigaction *const sa = &_jc_previous[sig_index];
 	const int sig_num = _jc_signals[sig_index];

Modified: incubator/harmony/enhanced/jchevm/libjc/structures.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/structures.h?rev=373984&r1=373983&r2=373984&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/structures.h (original)
+++ incubator/harmony/enhanced/jchevm/libjc/structures.h Tue Jan 31 20:13:02 2006
@@ -178,7 +178,7 @@
  */
 struct _jc_c_stack {
 	_jc_c_stack			*next;
-	jmp_buf				regs;
+	sigjmp_buf			regs;
 #ifndef NDEBUG
 	jboolean			clipped;
 #endif



Mime
View raw message