public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: STORE -> STORE_WORD; general cleanup.
@ 2008-04-04 20:03 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-04-04 20:03 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  b5f92bffe101a5b5305579407f6546696aafeb17 (commit)
       via  de1e5956ca112f470a3f360b6f5606d65a71c963 (commit)
      from  26deb2e6dfabff34eb940727518355d1b3381720 (commit)

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

- Log -----------------------------------------------------------------
commit b5f92bffe101a5b5305579407f6546696aafeb17
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Apr 4 16:02:28 2008 -0400

    STORE -> STORE_WORD; general cleanup.
    
    frysk-core/frysk/pkglibdir/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* funit-asm.S: Update to match frysk-asm.h's STORE_WORD.
    	* funit-watchpoint.S: Ditto.
    	* funit-symbols.S: Ditto.
    	* funit-location.S: Ditto.
    	* funit-raise.S (bad_addr_segv_label): Ditto.
    
    frysk-imports/include/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* frysk-asm.h (LOAD_WORD): Replace LOAD.
    	(STORE_WORD): Replace STORE.
    	(LOAD_BYTE, STORE_BYTE): New.
    	(WORD): Specify the size.
    	(ILLEGAL_INSTRUCTION): New.

commit de1e5956ca112f470a3f360b6f5606d65a71c963
Author: Andrew Cagney <cagney@redhat.com>
Date:   Fri Apr 4 14:25:03 2008 -0400

    Rename .xml man pages to .xml-in; reflects reality.
    
    frysk-common/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* manpages.sh: Don't apply SUBST.
    	(refpurposegrep): Change to a function.
    	* frysk.xml-in: Rename frysk.xml.
    	* Makefile.rules (SUFFIXES): Add .xml-in.
    	(.xml-in.xml): New.
    	(.xml.1): New.
    	(.xml.7): New.
    	(.xml.8): New.
    	* Makefile.gen.sh (.xml-in): Replace .xml.
    
    frysk-core/frysk/bindir/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* fauxv.xml-in: Rename fauxv.xml.
    	* fcatch.xml-in: Rename fcatch.xml.
    	* fcore.xml-in: Rename fcore.xml.
    	* fdebuginfo.xml-in: Rename fdebuginfo.xml.
    	* fdebugrpm.xml-in: Rename fdebugrpm.xml.
    	* ferror.xml-in: Rename ferror.xml.
    	* fexe.xml-in: Rename fexe.xml.
    	* fhpd.xml-in: Rename fhpd.xml.
    	* fmaps.xml-in: Rename fmaps.xml.
    	* fstack.xml-in: Rename fstack.xml.
    	* fstep.xml-in: Rename fstep.xml.
    	* ftrace.xml-in: Rename ftrace.xml.
    
    frysk-core/frysk/pkglibdir/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* fparser.xml-in: Rename fparser.xml.
    	* funit-exec.xml-in: Rename funit-exec.xml.
    	* funit-exit.xml-in: Rename funit-exit.xml.
    	* funit-slave.xml-in: Rename funit-slave.xml.
    	* funit-threads.xml-in: Rename funit-threads.xml.
    
    frysk-gui/frysk/bindir/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* frysk.xml-in: Rename frysk.xml.
    
    frysk-gui/frysk/pkglibdir/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* funit.xml-in: Rename funit.xml.
    	* ftail.xml-in: Rename ftail.xml.
    
    frysk-sys/frysk/pkglibdir/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* fsystest.xml-in: Rename fsystest.xml.
    	* funit-procmask.xml-in: Rename funit-procmask.xml.
    
    frysk-top/ChangeLog
    2008-04-04  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.am (CLEANFILES): Add frysk-common/frysk.xml.
    	(manpages manpages/index.html): Get man pages from build
    	directory.

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

Summary of changes:
 frysk-common/ChangeLog                             |   12 ++
 frysk-common/Makefile.gen.sh                       |   22 ++--
 frysk-common/Makefile.rules                        |   13 ++
 frysk-common/{frysk.xml => frysk.xml-in}           |    0 
 frysk-common/manpages.sh                           |   23 ++--
 frysk-core/frysk/bindir/ChangeLog                  |   15 ++
 .../frysk/bindir/{fauxv.xml => fauxv.xml-in}       |    0 
 .../frysk/bindir/{fcatch.xml => fcatch.xml-in}     |    0 
 .../frysk/bindir/{fcore.xml => fcore.xml-in}       |    0 
 .../bindir/{fdebuginfo.xml => fdebuginfo.xml-in}   |    0 
 .../bindir/{fdebugrpm.xml => fdebugrpm.xml-in}     |    0 
 .../frysk/bindir/{ferror.xml => ferror.xml-in}     |    0 
 frysk-core/frysk/bindir/{fexe.xml => fexe.xml-in}  |    0 
 frysk-core/frysk/bindir/{fhpd.xml => fhpd.xml-in}  |    0 
 .../frysk/bindir/{fmaps.xml => fmaps.xml-in}       |    0 
 .../frysk/bindir/{fstack.xml => fstack.xml-in}     |    0 
 .../frysk/bindir/{fstep.xml => fstep.xml-in}       |    0 
 .../frysk/bindir/{ftrace.xml => ftrace.xml-in}     |    0 
 frysk-core/frysk/pkglibdir/ChangeLog               |   14 ++
 .../pkglibdir/{fparser.xml => fparser.xml-in}      |    0 
 frysk-core/frysk/pkglibdir/funit-asm.S             |    2 +-
 .../{funit-exec.xml => funit-exec.xml-in}          |    0 
 .../{funit-exit.xml => funit-exit.xml-in}          |    0 
 frysk-core/frysk/pkglibdir/funit-location.S        |   12 +-
 frysk-core/frysk/pkglibdir/funit-raise.S           |    8 +-
 .../{funit-slave.xml => funit-slave.xml-in}        |    0 
 frysk-core/frysk/pkglibdir/funit-symbols.S         |   52 +++---
 .../{funit-threads.xml => funit-threads.xml-in}    |    0 
 frysk-core/frysk/pkglibdir/funit-watchpoint.S      |    8 +-
 frysk-gui/frysk/bindir/ChangeLog                   |    4 +
 frysk-gui/frysk/bindir/{frysk.xml => frysk.xml-in} |    0 
 frysk-gui/frysk/pkglibdir/ChangeLog                |    5 +
 .../frysk/pkglibdir/{ftail.xml => ftail.xml-in}    |    0 
 .../frysk/pkglibdir/{funit.xml => funit.xml-in}    |    0 
 frysk-imports/include/ChangeLog                    |    8 +
 frysk-imports/include/frysk-asm.h                  |  160 ++++++++++----------
 frysk-sys/frysk/pkglibdir/ChangeLog                |    5 +
 .../pkglibdir/{fsystest.xml => fsystest.xml-in}    |    0 
 .../{funit-procmask.xml => funit-procmask.xml-in}  |    0 
 frysk-top/ChangeLog                                |    6 +
 frysk-top/Makefile.am                              |   12 +-
 41 files changed, 224 insertions(+), 157 deletions(-)
 rename frysk-common/{frysk.xml => frysk.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fauxv.xml => fauxv.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fcatch.xml => fcatch.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fcore.xml => fcore.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fdebuginfo.xml => fdebuginfo.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fdebugrpm.xml => fdebugrpm.xml-in} (100%)
 rename frysk-core/frysk/bindir/{ferror.xml => ferror.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fexe.xml => fexe.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fhpd.xml => fhpd.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fmaps.xml => fmaps.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fstack.xml => fstack.xml-in} (100%)
 rename frysk-core/frysk/bindir/{fstep.xml => fstep.xml-in} (100%)
 rename frysk-core/frysk/bindir/{ftrace.xml => ftrace.xml-in} (100%)
 rename frysk-core/frysk/pkglibdir/{fparser.xml => fparser.xml-in} (100%)
 rename frysk-core/frysk/pkglibdir/{funit-exec.xml => funit-exec.xml-in} (100%)
 rename frysk-core/frysk/pkglibdir/{funit-exit.xml => funit-exit.xml-in} (100%)
 rename frysk-core/frysk/pkglibdir/{funit-slave.xml => funit-slave.xml-in} (100%)
 rename frysk-core/frysk/pkglibdir/{funit-threads.xml => funit-threads.xml-in} (100%)
 rename frysk-gui/frysk/bindir/{frysk.xml => frysk.xml-in} (100%)
 rename frysk-gui/frysk/pkglibdir/{ftail.xml => ftail.xml-in} (100%)
 rename frysk-gui/frysk/pkglibdir/{funit.xml => funit.xml-in} (100%)
 rename frysk-sys/frysk/pkglibdir/{fsystest.xml => fsystest.xml-in} (100%)
 rename frysk-sys/frysk/pkglibdir/{funit-procmask.xml => funit-procmask.xml-in} (100%)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 11ae984..43689c0 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,15 @@
+2008-04-04  Andrew Cagney  <cagney@redhat.com>
+
+	* manpages.sh: Don't apply SUBST.
+	(refpurposegrep): Change to a function.
+	* frysk.xml-in: Rename frysk.xml.
+	* Makefile.rules (SUFFIXES): Add .xml-in.
+	(.xml-in.xml): New.
+	(.xml.1): New.
+	(.xml.7): New.
+	(.xml.8): New.
+	* Makefile.gen.sh (.xml-in): Replace .xml.
+
 2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
 	    Petr Machata <pmachata@redhat.com>
 
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index e8628a6..a144827 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -107,7 +107,7 @@ JARS=`echo ${JARS}`
     -o -name "[A-Za-z0-9_]*\.glade" -print \
     -o -name "[A-Za-z0-9_]*\.png" -print \
     -o -name "[A-Za-z0-9_]*\.gif" -print \
-    -o -name "[A-Za-z0-9_]*\.xml" -print \
+    -o -name "[A-Za-z0-9_]*\.xml-in" -print \
     -o -path "*dir/[A-Za-z_]*\.[sS]" -print \
     -o -path "*dir/[A-Za-z_]*\.in" -print \
     -o -path "*dir/[A-Za-z_]*\.uu" -print \
@@ -171,8 +171,8 @@ check_MANS ()
     # bin/ directories require a man page.
     case "$1" in
 	*bindir/* )
-          if test ! -r $1.xml ; then
-	      echo "error: no $(basename $(dirname $1))/$(basename $1).xml man page" 1>&2
+          if test ! -r $1.xml-in ; then
+	      echo "error: no $(basename $(dirname $1))/$(basename $1).xml-in man page" 1>&2
 	      exit 1
 	  fi
 	  ;;
@@ -609,11 +609,11 @@ do
 done | sort -u
 
 
-# Generate rules for all .xml files, assume that they are converted to
-# man pages.
+# Generate rules for all .xml-in files, assume that they are converted
+# to man pages.
 
-print_header "... .xml"
-grep -e '\.xml$' files.list | while read xml
+print_header "... .xml-in"
+grep -e '\.xml-in$' files.list | while read xml
 do
   case "$xml" in
       *dir/* )
@@ -632,11 +632,9 @@ do
                   cat <<EOF
 man_MANS += ${d}/${title}.${n}
 CLEANFILES += ${d}/${title}.${n}
-${d}/${title}.${n}: $xml
-	mkdir -p ${d}
-	\$(SUBST_SED) < \$< > \$@.tmp
-	\$(XMLTO) -o ${d} man \$@.tmp
-	rm -f \$@.tmp
+CLEANFILES += ${d}/${title}.xml
+${d}/${title}.xml: $xml
+${d}/${title}.${n}: ${d}/${title}.xml
 EOF
 	  done
 	  ;;
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 13d8310..0a1a8d7 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -314,6 +314,19 @@ SUFFIXES += .cxx-in
 SUFFIXES += .c-in
 .c-in.c:
 	$(SUBST)
+SUFFIXES += .xml-in
+.xml-in.xml:
+	$(SUBST)
+.xml.1:
+	mkdir -p `dirname $@`
+	$(XMLTO) -o `dirname $@` man $<
+.xml.7:
+	mkdir -p `dirname $@`
+	$(XMLTO) -o `dirname $@` man $<
+.xml.8:
+	mkdir -p `dirname $@`
+	$(XMLTO) -o `dirname $@` man $<
+
 TestRunner.java: common/TestRunner.java-in
 	$(SUBST)
 $(GEN_SOURCENAME)/JUnitTests.java: files-java.list
diff --git a/frysk-common/frysk.xml b/frysk-common/frysk.xml-in
similarity index 100%
rename from frysk-common/frysk.xml
rename to frysk-common/frysk.xml-in
diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh
index c41513a..11658a7 100755
--- a/frysk-common/manpages.sh
+++ b/frysk-common/manpages.sh
@@ -39,7 +39,7 @@
 # exception.
 
 if [ $# -lt 1 ]; then
-    echo "Usage: $0 <template> -<heading> <xml-man-page> ..."
+    echo "Usage: $0 <template> -<heading> <xml-man-page> ..." 1>&2
     exit 1
 fi
 
@@ -57,7 +57,8 @@ sed -n < ${template} \
 
 # Generate the body for the man pages.
 
-refpurposegrep=$(cat << EOF
+refpurposegrep() {
+    sed -n '
 /<refpurpose>/{
  :loop
    /<\/refpurpose>/b break
@@ -72,8 +73,8 @@ refpurposegrep=$(cat << EOF
    p
    q
 }
-EOF
-)
+'
+}
 
 suffix=
 for xmlfile in "$@" ; do
@@ -91,19 +92,19 @@ EOF
 	    -e 's,.*ENTITY volume "\([0-9]\)".*,\1,p' \
 	    `
 	echo "Generating man webpage for ${name}.${n}" 1>&2
-	sed -e "s;@abs_root_srcdir@;${abs_root_srcdir};g" \
-	    < $xmlfile \
-	    > manpages/${name}.${n}.tmp
-	${XMLTO} -o manpages html manpages/${name}.${n}.tmp
+	${XMLTO} -o manpages html $xmlfile
 	rm -f manpages/${name}.${n}.tmp
 	mv manpages/index.html manpages/${name}.${n}.html 
 	
 	cat <<EOF
 <li><tt><a href="${name}.${n}.html">${name}.${n}</a></tt>
 EOF
-	# Catch empty (aka not on one line) refpurpose tags.
-	desc=$(sed -n "$refpurposegrep" $xmlfile)
-	if test -z "$desc"; then exit 1; fi
+	# Catch missing refpurpose tags.
+	desc=$(refpurposegrep < $xmlfile)
+	if test -z "$desc"; then
+	    echo "$xmlfile has no refpurpose tag" 1>&2
+	    exit 1
+	fi
 	echo "$desc"
 	echo "</li>"
     fi
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index adb3027..630d35f 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,3 +1,18 @@
+2008-04-04  Andrew Cagney  <cagney@redhat.com>
+
+	* fauxv.xml-in: Rename fauxv.xml.
+	* fcatch.xml-in: Rename fcatch.xml.
+	* fcore.xml-in: Rename fcore.xml.
+	* fdebuginfo.xml-in: Rename fdebuginfo.xml.
+	* fdebugrpm.xml-in: Rename fdebugrpm.xml.
+	* ferror.xml-in: Rename ferror.xml.
+	* fexe.xml-in: Rename fexe.xml.
+	* fhpd.xml-in: Rename fhpd.xml.
+	* fmaps.xml-in: Rename fmaps.xml.
+	* fstack.xml-in: Rename fstack.xml.
+	* fstep.xml-in: Rename fstep.xml.
+	* ftrace.xml-in: Rename ftrace.xml.
+
 2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
 
 	* fdebuginfo.xml: Put refpurpose tag on multiple lines.
diff --git a/frysk-core/frysk/bindir/fauxv.xml b/frysk-core/frysk/bindir/fauxv.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fauxv.xml
rename to frysk-core/frysk/bindir/fauxv.xml-in
diff --git a/frysk-core/frysk/bindir/fcatch.xml b/frysk-core/frysk/bindir/fcatch.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fcatch.xml
rename to frysk-core/frysk/bindir/fcatch.xml-in
diff --git a/frysk-core/frysk/bindir/fcore.xml b/frysk-core/frysk/bindir/fcore.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fcore.xml
rename to frysk-core/frysk/bindir/fcore.xml-in
diff --git a/frysk-core/frysk/bindir/fdebuginfo.xml b/frysk-core/frysk/bindir/fdebuginfo.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fdebuginfo.xml
rename to frysk-core/frysk/bindir/fdebuginfo.xml-in
diff --git a/frysk-core/frysk/bindir/fdebugrpm.xml b/frysk-core/frysk/bindir/fdebugrpm.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fdebugrpm.xml
rename to frysk-core/frysk/bindir/fdebugrpm.xml-in
diff --git a/frysk-core/frysk/bindir/ferror.xml b/frysk-core/frysk/bindir/ferror.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/ferror.xml
rename to frysk-core/frysk/bindir/ferror.xml-in
diff --git a/frysk-core/frysk/bindir/fexe.xml b/frysk-core/frysk/bindir/fexe.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fexe.xml
rename to frysk-core/frysk/bindir/fexe.xml-in
diff --git a/frysk-core/frysk/bindir/fhpd.xml b/frysk-core/frysk/bindir/fhpd.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fhpd.xml
rename to frysk-core/frysk/bindir/fhpd.xml-in
diff --git a/frysk-core/frysk/bindir/fmaps.xml b/frysk-core/frysk/bindir/fmaps.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fmaps.xml
rename to frysk-core/frysk/bindir/fmaps.xml-in
diff --git a/frysk-core/frysk/bindir/fstack.xml b/frysk-core/frysk/bindir/fstack.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fstack.xml
rename to frysk-core/frysk/bindir/fstack.xml-in
diff --git a/frysk-core/frysk/bindir/fstep.xml b/frysk-core/frysk/bindir/fstep.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/fstep.xml
rename to frysk-core/frysk/bindir/fstep.xml-in
diff --git a/frysk-core/frysk/bindir/ftrace.xml b/frysk-core/frysk/bindir/ftrace.xml-in
similarity index 100%
rename from frysk-core/frysk/bindir/ftrace.xml
rename to frysk-core/frysk/bindir/ftrace.xml-in
diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
index 4a28cf2..fce5b05 100644
--- a/frysk-core/frysk/pkglibdir/ChangeLog
+++ b/frysk-core/frysk/pkglibdir/ChangeLog
@@ -1,3 +1,17 @@
+2008-04-04  Andrew Cagney  <cagney@redhat.com>
+
+	* funit-asm.S: Update to match frysk-asm.h's STORE_WORD.
+	* funit-watchpoint.S: Ditto.
+	* funit-symbols.S: Ditto.
+	* funit-location.S: Ditto.
+	* funit-raise.S (bad_addr_segv_label): Ditto.
+
+	* fparser.xml-in: Rename fparser.xml.
+	* funit-exec.xml-in: Rename funit-exec.xml.
+	* funit-exit.xml-in: Rename funit-exit.xml.
+	* funit-slave.xml-in: Rename funit-slave.xml.
+	* funit-threads.xml-in: Rename funit-threads.xml.
+
 2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
 
 	* funit-exit.xml: Put refpurpose tag on multiple lines.
diff --git a/frysk-core/frysk/pkglibdir/fparser.xml b/frysk-core/frysk/pkglibdir/fparser.xml-in
similarity index 100%
rename from frysk-core/frysk/pkglibdir/fparser.xml
rename to frysk-core/frysk/pkglibdir/fparser.xml-in
diff --git a/frysk-core/frysk/pkglibdir/funit-asm.S b/frysk-core/frysk/pkglibdir/funit-asm.S
index 47c736e..0ade98c 100644
--- a/frysk-core/frysk/pkglibdir/funit-asm.S
+++ b/frysk-core/frysk/pkglibdir/funit-asm.S
@@ -45,7 +45,7 @@
 	// A known global symbol for checking the PC.
 .global crash
 crash:
-	STORE(REG0,REG0)
+	STORE_WORD(REG0,REG0)
 	NOP
 
 	FUNCTION_BEGIN(main,0)
diff --git a/frysk-core/frysk/pkglibdir/funit-exec.xml b/frysk-core/frysk/pkglibdir/funit-exec.xml-in
similarity index 100%
rename from frysk-core/frysk/pkglibdir/funit-exec.xml
rename to frysk-core/frysk/pkglibdir/funit-exec.xml-in
diff --git a/frysk-core/frysk/pkglibdir/funit-exit.xml b/frysk-core/frysk/pkglibdir/funit-exit.xml-in
similarity index 100%
rename from frysk-core/frysk/pkglibdir/funit-exit.xml
rename to frysk-core/frysk/pkglibdir/funit-exit.xml-in
diff --git a/frysk-core/frysk/pkglibdir/funit-location.S b/frysk-core/frysk/pkglibdir/funit-location.S
index 4083138..9dc2f43 100644
--- a/frysk-core/frysk/pkglibdir/funit-location.S
+++ b/frysk-core/frysk/pkglibdir/funit-location.S
@@ -48,17 +48,11 @@ LOAD_IMMED_WORD (REG3, 0x12345678)
 
 LOAD_IMMED_WORD (REG2, memory)
 
-STORE (REG0, REG0)   				// To crash program
+STORE_WORD (REG0, REG0)				// To crash program
 
 MAIN_EPILOGUE(0)
 FUNCTION_RETURN(main,0)
 FUNCTION_END(main,0)
 
-memory:						// Set up memory locations
-#if defined __powerpc64__
-	.8byte 0x12341234
-#elif defined __powerpc__
-	.4byte 0x1234
-#else
-	.word 0x1234
-#endif
+// Set up memory locations
+WORD(memory, 0x12341234)
diff --git a/frysk-core/frysk/pkglibdir/funit-raise.S b/frysk-core/frysk/pkglibdir/funit-raise.S
index f3fb530..c6a3ce2 100644
--- a/frysk-core/frysk/pkglibdir/funit-raise.S
+++ b/frysk-core/frysk/pkglibdir/funit-raise.S
@@ -48,14 +48,10 @@
 // Architecture dependent divide by zero and illegal instruction operator.
 #if defined(__i386__) || defined(__x86_64__)
 	#define DIV_ZERO(REG)	div REG;
-	#define ILL_INST	.word 0xffff;
 #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 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
@@ -80,13 +76,13 @@ RAISE_FUNCTION_END(div_zero)
 RAISE_FUNCTION_START(bad_addr_segv)
 	LOAD_IMMED_BYTE (REG0, 0)
 bad_addr_segv_label:
-	STORE (REG0, REG0)
+	STORE_WORD (REG0, REG0)
 	NO_OP			;  // never reached
 RAISE_FUNCTION_END(bad_addr_segv)
 
 RAISE_FUNCTION_START(bad_inst_ill)
 bad_inst_ill_label:
-	ILL_INST
+	ILLEGAL_INSTRUCTION
 	NO_OP			;  // never reached
 RAISE_FUNCTION_END(bad_inst_ill)
 
diff --git a/frysk-core/frysk/pkglibdir/funit-slave.xml b/frysk-core/frysk/pkglibdir/funit-slave.xml-in
similarity index 100%
rename from frysk-core/frysk/pkglibdir/funit-slave.xml
rename to frysk-core/frysk/pkglibdir/funit-slave.xml-in
diff --git a/frysk-core/frysk/pkglibdir/funit-symbols.S b/frysk-core/frysk/pkglibdir/funit-symbols.S
index 9f59f41..810e107 100644
--- a/frysk-core/frysk/pkglibdir/funit-symbols.S
+++ b/frysk-core/frysk/pkglibdir/funit-symbols.S
@@ -53,7 +53,7 @@
 # A global symbol that includes its size.
 GLOBAL(global_st_size)
 	LOAD_IMMED_BYTE (REG0, 0)
-	STORE (REG0, REG0)
+	STORE_WORD (REG0, REG0)
 	NO_OP
 	SIZE(global_st_size)
 
@@ -62,7 +62,7 @@ GLOBAL(global_st_size)
 # A local symbol that includes its size.
 LOCAL(local_st_size)	
 	LOAD_IMMED_BYTE (REG0, 0)
-	STORE (REG0, REG0)
+	STORE_WORD (REG0, REG0)
 	NO_OP
 	SIZE(local_st_size)
 
@@ -71,7 +71,7 @@ LOCAL(local_st_size)
 # A global symbol that has zero size.
 GLOBAL(global_st_size_0)
 	LOAD_IMMED_BYTE (REG0, 0)
-	STORE (REG0, REG0)
+	STORE_WORD (REG0, REG0)
 	NO_OP
 	
 \f
@@ -79,7 +79,7 @@ GLOBAL(global_st_size_0)
 # A local symbol that has zero size.
 LOCAL(local_st_size_0)
 	LOAD_IMMED_BYTE (REG0, 0)
-	STORE (REG0, REG0)
+	STORE_WORD (REG0, REG0)
 	NO_OP
 	
 \f
@@ -87,18 +87,18 @@ LOCAL(local_st_size_0)
 # A global symbol, with size, that contains a nested global and local
 # symbols each also with sizes.
 GLOBAL(global_outer)
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 GLOBAL(global_in_global)
-	STORE (REG0, REG0)
+	STORE_WORD (REG0, REG0)
 	NO_OP
 	SIZE(global_in_global)
 LOCAL(local_in_global)
-	STORE (REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 	SIZE(local_in_global)
 .Lglobal_outer:
-	STORE (REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 	SIZE(global_outer)
 
@@ -106,7 +106,7 @@ LOCAL(local_in_global)
 	
 # Code with no symbol after a global symbol with size.
 .Lno_global:
-	STORE (REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 	
 \f
@@ -114,18 +114,18 @@ LOCAL(local_in_global)
 # A global symbol, with size, that contains a nested global and local
 # symbols each also with sizes.
 LOCAL(local_outer)
-	STORE(REG0,REG0)
+	STORE_WORD(REG0,REG0)
 	NO_OP
 GLOBAL(global_in_local)
-	STORE (REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 	SIZE(global_in_local)
 LOCAL(local_in_local)
-	STORE (REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 	SIZE(local_in_local)
 .Llocal_outer:
-	STORE (REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 	SIZE(local_outer)
 
@@ -133,7 +133,7 @@ LOCAL(local_in_local)
 
 # Code with no symbol after a local symbol with size.
 .Lno_local:
-	STORE (REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 	
 \f
@@ -144,20 +144,20 @@ LOCAL(local_in_local)
 GLOBAL(global_after_0)
 	NO_OP
 GLOBAL(global_0_in_global)
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 LOCAL(local_0_in_global)
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 .Lglobal_after_0:
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	SIZE(global_after_0)
 
 \f
 
 # Code with no symbol after a global with nexted zero-sized symbols.
 .Lafter_global_containing_0:
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 
 \f
@@ -168,20 +168,20 @@ LOCAL(local_0_in_global)
 LOCAL(local_after_0)
 	NO_OP
 GLOBAL(global_0_in_local)
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 LOCAL(local_0_in_local)
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 .Llocal_after_0:
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	SIZE(local_after_0)
 
 \f
 
 # Code with no symbol after a local with nexted zero-sized symbols.
 .Lafter_local_containing_0:
-	STORE(REG0, REG0)
+	STORE_WORD(REG0, REG0)
 	NO_OP
 \f
 


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-04-04 20:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-04 20:03 [SCM] master: STORE -> STORE_WORD; general cleanup cagney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).