From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22175 invoked by alias); 21 Dec 2007 19:31:46 -0000 Received: (qmail 22150 invoked by uid 367); 21 Dec 2007 19:31:45 -0000 Date: Fri, 21 Dec 2007 19:31:00 -0000 Message-ID: <20071221193145.22135.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete unused BankRegister constructors. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4d109b2d560ed05e6887f358f2b7aa486a4e2a55 X-Git-Newrev: ddfabd8d35ebd64b1e8141b35e734d0edd57fd9c Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2007-q4/txt/msg00623.txt.bz2 The branch, master has been updated via ddfabd8d35ebd64b1e8141b35e734d0edd57fd9c (commit) from 4d109b2d560ed05e6887f358f2b7aa486a4e2a55 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit ddfabd8d35ebd64b1e8141b35e734d0edd57fd9c Author: Andrew Cagney Date: Fri Dec 21 14:30:02 2007 -0500 Delete unused BankRegister constructors. frysk-core/frysk/bank/ChangeLog 2007-12-21 Andrew Cagney * BankRegister.java (BankRegister(int,int,String)): Delete. (BankRegister(int,int,String,Register)): Delete. (name): Delete. (getName()): Update. * RegisterMap.java: Update. * BankArrayRegister.java: Update. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bank/BankArrayRegister.java | 2 +- frysk-core/frysk/bank/BankRegister.java | 16 +++------------- frysk-core/frysk/bank/ChangeLog | 7 +++++++ frysk-core/frysk/bank/RegisterMap.java | 5 ++--- 4 files changed, 13 insertions(+), 17 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bank/BankArrayRegister.java b/frysk-core/frysk/bank/BankArrayRegister.java index 7d1691a..a62bdfa 100644 --- a/frysk-core/frysk/bank/BankArrayRegister.java +++ b/frysk-core/frysk/bank/BankArrayRegister.java @@ -55,7 +55,7 @@ public class BankArrayRegister extends BankRegister { BankArrayRegister(int bank, BankRegister bankRegister) { super(bankRegister.getOffset(), bankRegister.getLength(), - bankRegister.getName(), bankRegister.getRegister()); + bankRegister.getRegister()); this.bank = bank; } diff --git a/frysk-core/frysk/bank/BankRegister.java b/frysk-core/frysk/bank/BankRegister.java index 76ab565..471fc82 100644 --- a/frysk-core/frysk/bank/BankRegister.java +++ b/frysk-core/frysk/bank/BankRegister.java @@ -50,31 +50,21 @@ public class BankRegister { private final int offset; private final int length; - private final String name; private final Register register; - BankRegister(int offset, int length, String name, Register register) { + BankRegister(int offset, int length, Register register) { this.offset = offset; this.length = length; - this.name = name; this.register = register; } - BankRegister(int offset, int length, String name) { - this(offset, length, name, null); - } - - BankRegister(int offset, int length, Register register) { - this(offset, length, register.getName(), register); - } - Register getRegister() { return register; } public String toString() { return (super.toString() + ",offset=" + offset + ",length=" + length - + ",name=" + name); + + ",register=" + register); } /** @@ -83,7 +73,7 @@ public class BankRegister { * @return the name */ public String getName() { - return name; + return register.getName(); } /** diff --git a/frysk-core/frysk/bank/ChangeLog b/frysk-core/frysk/bank/ChangeLog index 051b0ee..f3e43c9 100644 --- a/frysk-core/frysk/bank/ChangeLog +++ b/frysk-core/frysk/bank/ChangeLog @@ -1,5 +1,12 @@ 2007-12-21 Andrew Cagney + * BankRegister.java (BankRegister(int,int,String)): Delete. + (BankRegister(int,int,String,Register)): Delete. + (name): Delete. + (getName()): Update. + * RegisterMap.java: Update. + * BankArrayRegister.java: Update. + * X86BankRegisters.java (IA32_ON_X8664): Restore X87 CS and DS registers removed by previous commit. diff --git a/frysk-core/frysk/bank/RegisterMap.java b/frysk-core/frysk/bank/RegisterMap.java index 6776fe3..0e5dbe1 100644 --- a/frysk-core/frysk/bank/RegisterMap.java +++ b/frysk-core/frysk/bank/RegisterMap.java @@ -70,9 +70,8 @@ class RegisterMap { void put(BankRegister br) { Register register = br.getRegister(); - if (register != null) - registerToEntry.put(register, br); - nameToEntry.put(br.getName(), br); + registerToEntry.put(register, br); + nameToEntry.put(register.getName(), br); } Object get(Register r) { hooks/post-receive -- frysk system monitor/debugger