[SCM] master: Fix tests for PowerPC32/64, remove old debug information.

jflavio@sourceware.org jflavio@sourceware.org
Wed Dec 5 12:21:00 GMT 2007


The branch, master has been updated
       via  7d3bf0bd1f52d0b50f8bf7618ebcbb53da15bd13 (commit)
      from  aeabc3f897c851589dc688578f78450cd3210277 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 7d3bf0bd1f52d0b50f8bf7618ebcbb53da15bd13
Author: Jose Flavio Aguilar Paulino <joseflavio@gmail.com>
Date:   Wed Dec 5 10:21:24 2007 -0200

    Fix tests for PowerPC32/64, remove old debug information.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/pkglibdir/ChangeLog               |   14 ++++++++++++++
 frysk-core/frysk/pkglibdir/funit-location.S        |    4 +++-
 frysk-core/frysk/pkglibdir/funit-raise.S           |   19 +++++++++----------
 frysk-core/frysk/pkglibdir/funit-symbols.S         |   11 +++--------
 frysk-core/frysk/proc/live/ChangeLog               |    5 +++++
 .../proc/live/PtraceRegisterBanksFactory.java      |    1 -
 6 files changed, 34 insertions(+), 20 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
index bef2604..989cefa 100644
--- a/frysk-core/frysk/pkglibdir/ChangeLog
+++ b/frysk-core/frysk/pkglibdir/ChangeLog
@@ -1,5 +1,19 @@
 2007-12-04  Jose Flavio Aguilar Paulino <joseflavio@gmail.com>
 
+	* funit-regs.S: Add floating support for PowerPC64.
+
+	* funit-raise.S: Adding division by zero instructions for
+	PowerPC32. Put data section for usage text.
+
+	* funit-location.S: Fixed the test for PowerPC, it is using
+	the new LOAD_IMMED_WORD. Add a 8byte word for PowerPC64.
+
+	* funit-frameless.S: Same as above.
+
+	* funit-symbols.S: Same as above. Add data section for usage text.
+
+2007-12-04  Jose Flavio Aguilar Paulino <joseflavio@gmail.com>
+
 	* funit-regs.S: add support to PowerPC32/64 to this test.
  
 2007-12-03  Stan Cox  <scox@redhat.com>
diff --git a/frysk-core/frysk/pkglibdir/funit-location.S b/frysk-core/frysk/pkglibdir/funit-location.S
index e7021b8..cf188c2 100644
--- a/frysk-core/frysk/pkglibdir/funit-location.S
+++ b/frysk-core/frysk/pkglibdir/funit-location.S
@@ -54,7 +54,9 @@ FUNCTION_RETURN(main,0)
 FUNCTION_END(main,0)
 
 memory:						// Set up memory locations
-#if defined __powerpc__
+#if defined __powerpc64__
+	.8byte 0x12341234
+#elif defined __powerpc__
 	.4byte 0x1234
 #else
 	.word 0x1234
diff --git a/frysk-core/frysk/pkglibdir/funit-raise.S b/frysk-core/frysk/pkglibdir/funit-raise.S
index 1d648d6..f3fb530 100644
--- a/frysk-core/frysk/pkglibdir/funit-raise.S
+++ b/frysk-core/frysk/pkglibdir/funit-raise.S
@@ -1,6 +1,7 @@
 // This file is part of the program FRYSK.
 //
 // Copyright 2007 Red Hat Inc.
+// Copyright 2007 (C) IBM
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -48,10 +49,13 @@
 #if defined(__i386__) || defined(__x86_64__)
 	#define DIV_ZERO(REG)	div REG;
 	#define ILL_INST	.word 0xffff;
-#elif defined(__powerpc__)
+#elif defined __powerpc64__
 	#define DIV_ZERO(REG)	li 5, 0; divw 6, REG, 5
 	//PowePC64 has fixed size instructions upcodes, 16 bytes (64bits) long
-	#define ILL_INST	.8byte 0xffff; .8byte 0xffff;
+	#define ILL_INST	.8byte 0xffffffffffffffff;
+#elif defined __powerpc__
+	#define DIV_ZERO(REG)	li 5, 0; divw 6, REG, 5
+	#define ILL_INST	.4byte 0xffffffff; 
 #else
 	#error unsuported architecture
 #endif
@@ -141,12 +145,8 @@ FUNCTION_BEGIN(main,0)
 	LOAD_IMMED_BYTE(REG0, SYS_write)
 	LOAD_IMMED_BYTE(REG1, 1)
 
-	#if defined(__powerpc__)
-		#warning You cant load a LABEL as an immediate in PowerPC
-	#else
-		LOAD_IMMED_WORD(REG2, usage)
-		LOAD_IMMED_WORD(REG3, .usage-usage)
-	#endif
+	LOAD_IMMED_WORD(REG2, usage)
+	LOAD_IMMED_WORD(REG3, .usage-usage)
 
 	SYSCALL
 
@@ -158,8 +158,8 @@ exit_main:
 	FUNCTION_RETURN(main,0)
 FUNCTION_END(main,0)
 
+.data
 //In PowerPC you cant have unaligned upcodes in executable segment
-#if !defined(__powerpc__)
 usage:	.asciz "Usage:\r\n\
 	ARG1 ...\r\n\
 The number of arguments determines the function which this program\r\n\
@@ -171,4 +171,3 @@ calls and how it will raise a signal/trap because:\r\n\
 5: SIGURG ignore signal (ign_sig_urg)\r\n\
 "
 .usage:
-#endif
diff --git a/frysk-core/frysk/pkglibdir/funit-symbols.S b/frysk-core/frysk/pkglibdir/funit-symbols.S
index 3a1e45b..9f59f41 100644
--- a/frysk-core/frysk/pkglibdir/funit-symbols.S
+++ b/frysk-core/frysk/pkglibdir/funit-symbols.S
@@ -340,12 +340,9 @@ LOCAL(small_local_at_large_local)
 	LOAD_IMMED_BYTE(REG0, SYS_write)
 	LOAD_IMMED_BYTE(REG1, 1)
 
-#if defined(__powerpc__)
-	#warning You cant load a LABEL as an immediate in PowerPC
-#else
 	LOAD_IMMED_WORD(REG2, usage)
 	LOAD_IMMED_WORD(REG3, .usage-usage)
-#endif
+
 	SYSCALL
 		// exit with a non-zero status
 	LOAD_IMMED_BYTE(REG0, 1)
@@ -353,9 +350,8 @@ LOCAL(small_local_at_large_local)
 	FUNCTION_RETURN(main,0)
 	FUNCTION_END(main,0)
 
-#if defined(__powerpc__)
-#warning In PowerPC you cant have unaligned upcodes in executable segment
-#else
+//In PowerPC the next section can not stay in a executable segment
+.data
 usage:	.asciz "Usage:\r\n\
 	ARG1 ...\r\n\
 The number of arguments determines the symbol at which this program\r\n\
@@ -386,4 +382,3 @@ crashes:\r\n\
 24: No symbol after local with nested zero-sized symbols\r\n\
 "
 .usage:
-#endif
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 64f0443..f095694 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05  Jose Flavio Aguilar Paulino <joseflavio@gmail.com>
+
+	* PtraceRegisterBanksFactory.java: Removing PowerPC useless
+	debug information.
+
 2007-12-04  Andrew Cagney  <cagney@redhat.com>
 
 	Merge frysk.sys.Sig into frysk.sys.Signal.
diff --git a/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java b/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java
index 75aeed9..4777a2d 100644
--- a/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java
+++ b/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java
@@ -90,7 +90,6 @@ class PtraceRegisterBanksFactory {
 	for (int i = 0; i < bankBuffers.length; i++) {
             bankBuffers[i].order(ByteOrder.BIG_ENDIAN);
         }	
-	System.out.println("Usr Addr Space Size: " + bankBuffers[0].capacity());
 	return bankBuffers;
     }
 


hooks/post-receive
--
frysk system monitor/debugger



More information about the Frysk-cvs mailing list