public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Eliminate frysk.sys.proc.AuxvBuilder from corefile reader/writer code.
@ 2008-06-05  1:17 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-06-05  1:17 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  8388555b8736e61a49211759ec5f9e8c247c0221 (commit)
      from  72412ec819241b1c1d619ef2ab14b2ec4bd5ae1a (commit)

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

- Log -----------------------------------------------------------------
commit 8388555b8736e61a49211759ec5f9e8c247c0221
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Jun 4 21:13:47 2008 -0400

    Eliminate frysk.sys.proc.AuxvBuilder from corefile reader/writer code.
    
    This changes the corefile code so that it encodes and decodes the
    corefiles's auxv using the more portable ByteBuffer, rather than
    directly accessing /proc/<PID>/auxv.
    
    frysk-core/frysk/isa/corefiles/ChangeLog
    2008-06-04  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxElfCorefile.java (writeNoteAuxVec): Make concrete.
    	* X8664LinuxElfCorefile.java (writeNoteAuxVec): Delete.
    	* PPC64LinuxElfCorefile.java (writeNoteAuxVec): Delete.
    	* PPC32LinuxElfCorefile.java (writeNoteAuxVec): Delete.
    	* IA32LinuxElfCorefile.java (writeNoteAuxVec): Delete.
    
    frysk-core/frysk/proc/dead/ChangeLog
    2008-06-04  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxCoreInfo.java (constructAuxv): Eliminate use of
    	frysk.sys.proc.AuxvBuilder.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-06-04  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceProc.java: Delete AuxvBuilder.buildBuffer.
    
    frysk-sys/frysk/sys/proc/ChangeLog
    2008-06-04  Andrew Cagney  <cagney@redhat.com>
    
    	* AuxvBuilder.java (buildAuxv(byte[])): Delete.
    	* cni/AuxvBuilder.cxx (AuxvBuilder::construct): Update.
    	* TestAuxv.java: Update.
    
    frysk-sys/lib/dwfl/ChangeLog
    2008-06-04  Andrew Cagney  <cagney@redhat.com>
    
    	* ElfPrAuxv.java: Make the ByteBuffer available.
    	(getEntrySize()): Make non-native.
    	(fillMemRegion): Make non-native.
    	* cni/ElfPrAuxv.cxx: Update.
    	* jni/ElfPrAuxv.cxx: Update.
    	* TestElf.java: Delete AuxvBuilder.buildBuffer.
    	(checkAuxv): New, doesn't use sys.AuxvBuilder.
    	(testElfCorePrAuxvNotes_x86, testElfCorePrAuxvNotes_x8664): Use.

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

Summary of changes:
 frysk-core/frysk/isa/corefiles/ChangeLog           |    8 +
 .../frysk/isa/corefiles/IA32LinuxElfCorefile.java  |   28 ---
 .../frysk/isa/corefiles/LinuxElfCorefile.java      |   19 ++-
 .../frysk/isa/corefiles/PPC32LinuxElfCorefile.java |   28 ---
 .../frysk/isa/corefiles/PPC64LinuxElfCorefile.java |   28 ---
 .../frysk/isa/corefiles/X8664LinuxElfCorefile.java |   28 ---
 frysk-core/frysk/proc/dead/ChangeLog               |    5 +
 frysk-core/frysk/proc/dead/LinuxCoreInfo.java      |   29 ++--
 frysk-core/frysk/proc/live/ChangeLog               |    4 +
 frysk-core/frysk/proc/live/LinuxPtraceProc.java    |    2 -
 frysk-sys/frysk/sys/proc/AuxvBuilder.java          |    6 -
 frysk-sys/frysk/sys/proc/ChangeLog                 |    4 +
 frysk-sys/frysk/sys/proc/TestAuxv.java             |    4 -
 frysk-sys/frysk/sys/proc/cni/AuxvBuilder.cxx       |    1 -
 frysk-sys/lib/dwfl/ChangeLog                       |    9 +
 frysk-sys/lib/dwfl/ElfPrAuxv.java                  |  126 +++++++-------
 frysk-sys/lib/dwfl/TestElf.java                    |  186 +++++++-------------
 frysk-sys/lib/dwfl/cni/ElfPrAuxv.cxx               |   25 ---
 frysk-sys/lib/dwfl/jni/ElfPrAuxv.cxx               |   25 ---
 19 files changed, 190 insertions(+), 375 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/isa/corefiles/ChangeLog b/frysk-core/frysk/isa/corefiles/ChangeLog
index a0afb19..4d0d741 100644
--- a/frysk-core/frysk/isa/corefiles/ChangeLog
+++ b/frysk-core/frysk/isa/corefiles/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-04  Andrew Cagney  <cagney@redhat.com>
+
+	* LinuxElfCorefile.java (writeNoteAuxVec): Make concrete.
+	* X8664LinuxElfCorefile.java (writeNoteAuxVec): Delete.
+	* PPC64LinuxElfCorefile.java (writeNoteAuxVec): Delete.
+	* PPC32LinuxElfCorefile.java (writeNoteAuxVec): Delete.
+	* IA32LinuxElfCorefile.java (writeNoteAuxVec): Delete.
+
 2008-05-20  Andrew Cagney  <cagney@redhat.com>
 
 	* IA32LinuxElfCorefile.java (buildBuffer(byte[])): Delete.
diff --git a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
index d7aa00d..af626a4 100644
--- a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
@@ -39,7 +39,6 @@
 
 package frysk.isa.corefiles;
 
-import frysk.sys.ProcessIdentifier;
 import frysk.sys.ProcessIdentifierFactory;
 import inua.eio.ArrayByteBuffer;
 import java.util.Iterator;
@@ -47,7 +46,6 @@ import lib.dwfl.ElfEHeader;
 import lib.dwfl.ElfEMachine;
 import lib.dwfl.ElfNhdr;
 import lib.dwfl.ElfNhdrType;
-import lib.dwfl.ElfPrAuxv;
 import lib.dwfl.ElfPrFPRegSet;
 import lib.dwfl.ElfPrXFPRegSet;
 import lib.dwfl.ElfPrpsinfo;
@@ -58,7 +56,6 @@ import frysk.isa.registers.IA32Registers;
 import frysk.isa.registers.Register;
 import frysk.proc.Proc;
 import frysk.proc.Task;
-import frysk.sys.proc.AuxvBuilder;
 import frysk.sys.proc.CmdLineBuilder;
 import frysk.sys.proc.Stat;
 
@@ -281,31 +278,6 @@ public class IA32LinuxElfCorefile extends LinuxElfCorefile {
     }
 
     /* (non-Javadoc)
-     * @see frysk.util.LinuxElfCorefile#writeNoteAuxVec(lib.dwfl.ElfNhdr, frysk.proc.Proc)
-     */
-    protected void writeNoteAuxVec(ElfNhdr nhdrEntry, Proc proc) {
-	final ElfPrAuxv prAuxv = new ElfPrAuxv();
-
-	// Build Process Auxilliary
-	AuxvBuilder builder = new AuxvBuilder() {
-
-	    public void buildBuffer(byte[] auxv) {
-		prAuxv.setAuxvBuffer(auxv);
-	    }
-
-	    public void buildDimensions(int wordSize, boolean bigEndian,
-		    int length) {
-	    }
-
-	    public void buildAuxiliary(int index, int type, long val) {
-	    }
-	};
-	ProcessIdentifier pid = ProcessIdentifierFactory.create(proc.getPid());
-	builder.construct(pid);
-	nhdrEntry.setNhdrDesc(ElfNhdrType.NT_AUXV, prAuxv);
-    }
-
-    /* (non-Javadoc)
      * @see frysk.util.LinuxElfCorefile#getElfMachineType()
      */
     protected byte getElfMachineType() {
diff --git a/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
index dd6c686..0686c2d 100644
--- a/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
@@ -39,6 +39,10 @@
 
 package frysk.isa.corefiles;
 
+import inua.eio.ByteBuffer;
+import lib.dwfl.ElfPrAuxv;
+import lib.dwfl.ElfNhdrType;
+import frysk.proc.Auxv;
 import frysk.sys.ProcessIdentifierFactory;
 import frysk.isa.ISA;
 import java.util.ArrayList;
@@ -283,10 +287,21 @@ public abstract class LinuxElfCorefile {
      * contained within the task.
      * 
      * @param nhdrEntry - the note header entry this function is to populate.
-     * @param task - the frysk.proc.live.Taskthat provides seed info to
+     * @param Proc - the frysk.proc.Proc that provides seed info to
      * populate the note header.
      */ 
-    protected abstract void writeNoteAuxVec(ElfNhdr nhdrEntry, Proc process);
+    void writeNoteAuxVec(ElfNhdr nhdrEntry, Proc process) {
+	ISA isa = process.getMainTask().getISA();
+	Auxv[] auxv = process.getAuxv();
+	ElfPrAuxv prAuxv = new ElfPrAuxv(auxv.length, isa.wordSize(),
+					 isa.order());
+	ByteBuffer byteArray = prAuxv.getByteBuffer();
+	for (int i = 0; i < auxv.length; i++) {
+	    byteArray.putWord(auxv[i].type);
+	    byteArray.putWord(auxv[i].val);
+	}
+	nhdrEntry.setNhdrDesc(ElfNhdrType.NT_AUXV, prAuxv);
+    }
 
     /**
      * 
diff --git a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
index bbab7c2..3968dea 100644
--- a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
@@ -43,7 +43,6 @@
 
 package frysk.isa.corefiles;
 
-import frysk.sys.ProcessIdentifier;
 import frysk.sys.ProcessIdentifierFactory;
 import java.util.Iterator;
 import inua.eio.ArrayByteBuffer;
@@ -52,7 +51,6 @@ import lib.dwfl.ElfEHeader;
 import lib.dwfl.ElfEMachine;
 import lib.dwfl.ElfNhdr;
 import lib.dwfl.ElfNhdrType;
-import lib.dwfl.ElfPrAuxv;
 import lib.dwfl.ElfPrFPRegSet;
 import lib.dwfl.ElfPrpsinfo;
 import lib.dwfl.ElfPrstatus;
@@ -62,7 +60,6 @@ import frysk.isa.banks.BankRegister;
 import frysk.isa.banks.LinuxPPCRegisterBanks;
 import frysk.proc.Proc;
 import frysk.proc.Task;
-import frysk.sys.proc.AuxvBuilder;
 import frysk.sys.proc.CmdLineBuilder;
 import frysk.sys.proc.Stat;
 
@@ -283,31 +280,6 @@ public class PPC32LinuxElfCorefile extends LinuxElfCorefile {
     }
 
     /* (non-Javadoc)
-     * @see frysk.util.LinuxElfCorefile#writeNoteAuxVec(lib.dwfl.ElfNhdr, frysk.proc.Proc)
-     */
-    protected void writeNoteAuxVec(ElfNhdr nhdrEntry, Proc proc) {
-	final ElfPrAuxv prAuxv = new ElfPrAuxv();
-
-	// Build Process Auxilliary
-	AuxvBuilder builder = new AuxvBuilder() {
-
-	    public void buildBuffer(byte[] auxv) {
-		prAuxv.setAuxvBuffer(auxv);
-	    }
-
-	    public void buildDimensions(int wordSize, boolean bigEndian,
-		    int length) {
-	    }
-
-	    public void buildAuxiliary(int index, int type, long val) {
-	    }
-	};
-	ProcessIdentifier pid = ProcessIdentifierFactory.create(proc.getPid());
-	builder.construct(pid);
-	nhdrEntry.setNhdrDesc(ElfNhdrType.NT_AUXV, prAuxv);
-    }
-
-    /* (non-Javadoc)
      * @see frysk.util.LinuxElfCorefile#getElfMachineType()
      */
     protected byte getElfMachineType() {
diff --git a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
index 0e977f9..42b15ca 100644
--- a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
@@ -43,7 +43,6 @@
 
 package frysk.isa.corefiles;
 
-import frysk.sys.ProcessIdentifier;
 import frysk.sys.ProcessIdentifierFactory;
 import inua.eio.ArrayByteBuffer;
 import java.util.Iterator;
@@ -51,7 +50,6 @@ import lib.dwfl.ElfEHeader;
 import lib.dwfl.ElfEMachine;
 import lib.dwfl.ElfNhdr;
 import lib.dwfl.ElfNhdrType;
-import lib.dwfl.ElfPrAuxv;
 import lib.dwfl.ElfPrFPRegSet;
 import lib.dwfl.ElfPrpsinfo;
 import lib.dwfl.ElfPrstatus;
@@ -61,7 +59,6 @@ import frysk.isa.banks.BankRegister;
 import frysk.isa.banks.LinuxPPCRegisterBanks;
 import frysk.proc.Proc;
 import frysk.proc.Task;
-import frysk.sys.proc.AuxvBuilder;
 import frysk.sys.proc.CmdLineBuilder;
 import frysk.sys.proc.Stat;
 
@@ -274,31 +271,6 @@ public class PPC64LinuxElfCorefile extends LinuxElfCorefile {
     }
 
     /* (non-Javadoc)
-     * @see frysk.util.LinuxElfCorefile#writeNoteAuxVec(lib.dwfl.ElfNhdr, frysk.proc.Proc)
-     */
-    protected void writeNoteAuxVec(ElfNhdr nhdrEntry, Proc proc) {
-	final ElfPrAuxv prAuxv = new ElfPrAuxv();
-
-	// Build Process Auxilliary
-	AuxvBuilder builder = new AuxvBuilder() {
-
-	    public void buildBuffer(byte[] auxv) {
-		prAuxv.setAuxvBuffer(auxv);
-	    }
-
-	    public void buildDimensions(int wordSize, boolean bigEndian,
-		    int length) {
-	    }
-
-	    public void buildAuxiliary(int index, int type, long val) {
-	    }
-	};
-	ProcessIdentifier pid = ProcessIdentifierFactory.create(proc.getPid());
-	builder.construct(pid);
-	nhdrEntry.setNhdrDesc(ElfNhdrType.NT_AUXV, prAuxv);
-    }
-
-    /* (non-Javadoc)
      * @see frysk.util.LinuxElfCorefile#getElfMachineType()
      */
     protected byte getElfMachineType() {
diff --git a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
index d18fe0d..8679aeb 100644
--- a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
@@ -39,7 +39,6 @@
 
 package frysk.isa.corefiles;
 
-import frysk.sys.ProcessIdentifier;
 import frysk.sys.ProcessIdentifierFactory;
 import inua.eio.ArrayByteBuffer;
 import java.util.Iterator;
@@ -47,7 +46,6 @@ import lib.dwfl.ElfEHeader;
 import lib.dwfl.ElfEMachine;
 import lib.dwfl.ElfNhdr;
 import lib.dwfl.ElfNhdrType;
-import lib.dwfl.ElfPrAuxv;
 import lib.dwfl.ElfPrFPRegSet;
 import lib.dwfl.ElfPrpsinfo;
 import lib.dwfl.ElfPrstatus;
@@ -57,7 +55,6 @@ import frysk.isa.registers.Register;
 import frysk.isa.registers.X8664Registers;
 import frysk.proc.Proc;
 import frysk.proc.Task;
-import frysk.sys.proc.AuxvBuilder;
 import frysk.sys.proc.CmdLineBuilder;
 import frysk.sys.proc.Stat;
 
@@ -267,31 +264,6 @@ public class X8664LinuxElfCorefile extends LinuxElfCorefile {
     }
 
     /* (non-Javadoc)
-     * @see frysk.util.LinuxElfCorefile#writeNoteAuxVec(lib.dwfl.ElfNhdr, frysk.proc.Proc)
-     */
-    protected void writeNoteAuxVec(ElfNhdr nhdrEntry, Proc proc) {
-	final ElfPrAuxv prAuxv = new ElfPrAuxv();
-
-	// Build Process Auxilliary
-	AuxvBuilder builder = new AuxvBuilder() {
-
-	    public void buildBuffer(byte[] auxv) {
-		prAuxv.setAuxvBuffer(auxv);
-	    }
-
-	    public void buildDimensions(int wordSize, boolean bigEndian,
-		    int length) {
-	    }
-
-	    public void buildAuxiliary(int index, int type, long val) {
-	    }
-	};
-	ProcessIdentifier pid = ProcessIdentifierFactory.create(proc.getPid());
-	builder.construct(pid);
-	nhdrEntry.setNhdrDesc(ElfNhdrType.NT_AUXV, prAuxv);
-    }
-
-    /* (non-Javadoc)
      * @see frysk.util.LinuxElfCorefile#getElfMachineType()
      */
     protected byte getElfMachineType() {
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 2f5d793..a66b5dd 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-04  Andrew Cagney  <cagney@redhat.com>
+
+	* LinuxCoreInfo.java (constructAuxv): Eliminate use of
+	frysk.sys.proc.AuxvBuilder.
+
 2008-05-20  Andrew Cagney  <cagney@redhat.com>
 
 	* LinuxExeFactory.java: Add more logging.
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreInfo.java b/frysk-core/frysk/proc/dead/LinuxCoreInfo.java
index 84144b1..08248af 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreInfo.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreInfo.java
@@ -39,6 +39,7 @@
 
 package frysk.proc.dead;
 
+import inua.eio.ByteBuffer;
 import java.util.List;
 import java.util.LinkedList;
 import java.io.File;
@@ -56,7 +57,6 @@ import lib.dwfl.ElfPHeader;
 import lib.dwfl.ElfPrpsinfo;
 import frysk.rsl.Log;
 import frysk.proc.Auxv;
-import frysk.sys.proc.AuxvBuilder;
 import frysk.sysroot.SysRoot;
 import frysk.proc.MemoryMap;
 import frysk.solib.LinkMapFactory;
@@ -103,6 +103,7 @@ class LinuxCoreInfo {
 		throw new RuntimeException("'" + coreParam
 					   + "' is not a corefile.");
 	    }
+	    this.isa = ElfMap.getISA(eHeader);
 	
 	    // Find the note section that contains all the notes;
 	    // there is only ever one note section and it must be
@@ -150,7 +151,6 @@ class LinuxCoreInfo {
 	    this.elfTasks = ElfPrstatus.decode(noteSection);
 	    this.elfFPRegs = ElfPrFPRegSet.decode(noteSection);
 	    this.elfXFPRegs = ElfPrXFPRegSet.decode(noteSection);
-	    this.isa = ElfMap.getISA(eHeader);
 	} finally { 
 	    if (coreElf != null)
 		coreElf.close();
@@ -243,24 +243,19 @@ class LinuxCoreInfo {
     /**
      * Extract the AUXV .note from the notSection.
      */
-    private static Auxv[] constructAuxv(ElfData noteSection) {
+    private Auxv[] constructAuxv(ElfData noteSection) {
 	fine.log("constructAuxv");
 	final ElfPrAuxv prAuxv =  ElfPrAuxv.decode(noteSection);
-	class BuildAuxv extends AuxvBuilder {
-	    Auxv[] vec;
-	    public void buildBuffer(byte[] auxv) {
-	    }
-	    public void buildDimensions(int wordSize, boolean bigEndian,
-					int length) {
-		vec = new Auxv[length];
-	    }
-	    public void buildAuxiliary(int index, int type, long val) {
-		vec[index] = new Auxv(type, val);
-	    }
+	ByteBuffer bytes = prAuxv.getByteBuffer();
+	Auxv[] auxv = new Auxv[(int) bytes.capacity() / 2 / isa.wordSize()];
+	int i = 0;
+	while (bytes.position() < bytes.capacity()) {
+	    int type = (int) bytes.getUWord();
+	    long value = bytes.getUWord();
+	    auxv[i] = new Auxv(type, value);
+	    i++;
 	}
-	BuildAuxv auxv = new BuildAuxv();
-	auxv.construct(prAuxv.getAuxvBuffer());
-	return auxv.vec;
+	return auxv;
     }
 
     /**
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 6f68db7..f9a12dd 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-04  Andrew Cagney  <cagney@redhat.com>
+
+	* LinuxPtraceProc.java: Delete AuxvBuilder.buildBuffer.
+
 2008-05-21  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	ObjectDeclarationSearchEngine constructor now
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
index d05466b..e854829 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
@@ -133,8 +133,6 @@ public class LinuxPtraceProc extends LiveProc {
 	if (auxv == null) {
 	    class BuildAuxv extends AuxvBuilder {
 		Auxv[] vec;
-		public void buildBuffer (byte[] auxv) {
-		}
 		public void buildDimensions (int wordSize, boolean bigEndian,
 					     int length) {
 		    vec = new Auxv[length];
diff --git a/frysk-sys/frysk/sys/proc/AuxvBuilder.java b/frysk-sys/frysk/sys/proc/AuxvBuilder.java
index 4ab0941..fda5bb0 100644
--- a/frysk-sys/frysk/sys/proc/AuxvBuilder.java
+++ b/frysk-sys/frysk/sys/proc/AuxvBuilder.java
@@ -71,12 +71,6 @@ public abstract class AuxvBuilder {
     public final native boolean construct (byte[] auxv);
 
     /**
-     * Called with the raw byte buffer slurped by {@link
-     * #construct(ProcessIdentifier)}.
-     */
-    public abstract void buildBuffer (byte[] auxv);
-
-    /**
      * Called with the wordSize, byte order, and number of elements.
      */
     public abstract void buildDimensions (int wordSize, boolean bigEndian,
diff --git a/frysk-sys/frysk/sys/proc/ChangeLog b/frysk-sys/frysk/sys/proc/ChangeLog
index 9c7dcc0..800e221 100644
--- a/frysk-sys/frysk/sys/proc/ChangeLog
+++ b/frysk-sys/frysk/sys/proc/ChangeLog
@@ -1,5 +1,9 @@
 2008-06-04  Andrew Cagney  <cagney@redhat.com>
 
+	* AuxvBuilder.java (buildAuxv(byte[])): Delete.
+	* cni/AuxvBuilder.cxx (AuxvBuilder::construct): Update.
+	* TestAuxv.java: Update.
+	
 	* TestAuxv.java (testNative()): New.
 
 2008-05-25  Andrew Cagney  <cagney@redhat.com>
diff --git a/frysk-sys/frysk/sys/proc/TestAuxv.java b/frysk-sys/frysk/sys/proc/TestAuxv.java
index 7645202..33c81b9 100644
--- a/frysk-sys/frysk/sys/proc/TestAuxv.java
+++ b/frysk-sys/frysk/sys/proc/TestAuxv.java
@@ -74,8 +74,6 @@ public class TestAuxv extends TestCase {
 		this.vec = vec;
 		this.bigEndian = bigEndian;
 	    }
-	    public void buildBuffer(byte[] auxv) {
-	    }
 	    public void buildDimensions(int wordSize, boolean bigEndian,
 					int length) {
 		assertEquals("word size", this.wordSize, wordSize);
@@ -346,8 +344,6 @@ public class TestAuxv extends TestCase {
 
     public void testNative() {
 	AuxvBuilder auxv = new AuxvBuilder() {
-		public void buildBuffer(byte[] auxv) {
-		}
 		public void buildDimensions(int wordSize, boolean bigEndian,
 					    int length) {
 		    assertEquals("wordSize", Host.wordSize(), wordSize * 8);
diff --git a/frysk-sys/frysk/sys/proc/cni/AuxvBuilder.cxx b/frysk-sys/frysk/sys/proc/cni/AuxvBuilder.cxx
index e06fcd4..440a45e 100644
--- a/frysk-sys/frysk/sys/proc/cni/AuxvBuilder.cxx
+++ b/frysk-sys/frysk/sys/proc/cni/AuxvBuilder.cxx
@@ -134,7 +134,6 @@ frysk::sys::proc::AuxvBuilder::construct (jint pid)
   jbyteArray buf = slurp (pid, "auxv");
   if (buf == NULL)
     return false;
-  buildBuffer (buf);
   return construct (buf);
 }
 
diff --git a/frysk-sys/lib/dwfl/ChangeLog b/frysk-sys/lib/dwfl/ChangeLog
index 87830a7..cdadecd 100644
--- a/frysk-sys/lib/dwfl/ChangeLog
+++ b/frysk-sys/lib/dwfl/ChangeLog
@@ -1,5 +1,14 @@
 2008-06-04  Andrew Cagney  <cagney@redhat.com>
 
+	* ElfPrAuxv.java: Make the ByteBuffer available.
+	(getEntrySize()): Make non-native.
+	(fillMemRegion): Make non-native.
+	* cni/ElfPrAuxv.cxx: Update.
+	* jni/ElfPrAuxv.cxx: Update.
+	* TestElf.java: Delete AuxvBuilder.buildBuffer.
+	(checkAuxv): New, doesn't use sys.AuxvBuilder.
+	(testElfCorePrAuxvNotes_x86, testElfCorePrAuxvNotes_x8664): Use.
+
 	* Dwfl.java (getCompilationUnitModule(DwarfDie)): Delete.
 	* TestDwfl.java: Update.
 	* jni/Dwfl.cxx: Update.
diff --git a/frysk-sys/lib/dwfl/ElfPrAuxv.java b/frysk-sys/lib/dwfl/ElfPrAuxv.java
index 2c38c1d..37b2d81 100644
--- a/frysk-sys/lib/dwfl/ElfPrAuxv.java
+++ b/frysk-sys/lib/dwfl/ElfPrAuxv.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2006, 2007 Red Hat Inc.
+// Copyright 2006, 2007, 2008 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by


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


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

only message in thread, other threads:[~2008-06-05  1:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-05  1:17 [SCM] master: Eliminate frysk.sys.proc.AuxvBuilder from corefile reader/writer code 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).