From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15643 invoked by alias); 21 Dec 2007 19:14:11 -0000 Received: (qmail 15615 invoked by uid 367); 21 Dec 2007 19:14:10 -0000 Date: Fri, 21 Dec 2007 19:14:00 -0000 Message-ID: <20071221191409.15600.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix typo; restore X87 CS and DS registers. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 2bbd8dfdf088c41277d4ef72f3d8b22b25271daf X-Git-Newrev: 4d109b2d560ed05e6887f358f2b7aa486a4e2a55 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/msg00622.txt.bz2 The branch, master has been updated via 4d109b2d560ed05e6887f358f2b7aa486a4e2a55 (commit) via fcd7fc715af0cc88ffba233c09bcb07ff454580d (commit) from 2bbd8dfdf088c41277d4ef72f3d8b22b25271daf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 4d109b2d560ed05e6887f358f2b7aa486a4e2a55 Author: Andrew Cagney Date: Fri Dec 21 14:13:12 2007 -0500 Fix typo; restore X87 CS and DS registers. frysk-core/frysk/bank/ChangeLog 2007-12-21 Andrew Cagney * X86BankRegisters.java (IA32_ON_X8664): Restore X87 CS and DS registers removed by previous commit. commit fcd7fc715af0cc88ffba233c09bcb07ff454580d Author: Andrew Cagney Date: Fri Dec 21 13:14:20 2007 -0500 Replace strings with consants. 2007-12-21 Andrew Cagney * LinuxX8664RegisterBanks.java: Use constants from X8664Registers for "ss", "ds", "es", "fs", and "cs. * X86BankRegisters.java: Ditto. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bank/ChangeLog | 7 ++++ frysk-core/frysk/bank/LinuxX8664RegisterBanks.java | 36 ++++++++++---------- frysk-core/frysk/bank/X86BankRegisters.java | 12 +++--- 3 files changed, 31 insertions(+), 24 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bank/ChangeLog b/frysk-core/frysk/bank/ChangeLog index 0407fd3..051b0ee 100644 --- a/frysk-core/frysk/bank/ChangeLog +++ b/frysk-core/frysk/bank/ChangeLog @@ -1,5 +1,12 @@ 2007-12-21 Andrew Cagney + * X86BankRegisters.java (IA32_ON_X8664): Restore X87 CS and DS + registers removed by previous commit. + + * LinuxX8664RegisterBanks.java: Use constants from X8664Registers + for "ss", "ds", "es", "fs", and "cs. + * X86BankRegisters.java: Ditto. + * IndirectBankArrayRegisterMap.java (IndirectBankArrayRegisterMap(Register,int,int,int)): Update. * BankArrayRegisterMap.java diff --git a/frysk-core/frysk/bank/LinuxX8664RegisterBanks.java b/frysk-core/frysk/bank/LinuxX8664RegisterBanks.java index e2d583a..e566087 100644 --- a/frysk-core/frysk/bank/LinuxX8664RegisterBanks.java +++ b/frysk-core/frysk/bank/LinuxX8664RegisterBanks.java @@ -46,33 +46,33 @@ public class LinuxX8664RegisterBanks { public static final BankRegisterMap REGS = new BankRegisterMap() - .add(new BankRegister(80, 8, X8664Registers.RAX)) + .add(new BankRegister(0, 8, X8664Registers.R15)) + .add(new BankRegister(8, 8, X8664Registers.R14)) + .add(new BankRegister(16, 8, X8664Registers.R13)) + .add(new BankRegister(24, 8, X8664Registers.R12)) + .add(new BankRegister(32, 8, X8664Registers.RBP)) .add(new BankRegister(40, 8, X8664Registers.RBX)) + .add(new BankRegister(48, 8, X8664Registers.R11)) + .add(new BankRegister(56, 8, X8664Registers.R10)) + .add(new BankRegister(64, 8, X8664Registers.R9)) + .add(new BankRegister(72, 8, X8664Registers.R8)) + .add(new BankRegister(80, 8, X8664Registers.RAX)) .add(new BankRegister(88, 8, X8664Registers.RCX)) .add(new BankRegister(96, 8, X8664Registers.RDX)) .add(new BankRegister(104, 8, X8664Registers.RSI)) .add(new BankRegister(112, 8, X8664Registers.RDI)) - .add(new BankRegister(32, 8, X8664Registers.RBP)) - .add(new BankRegister(152, 8, X8664Registers.RSP)) - .add(new BankRegister(72, 8, X8664Registers.R8)) - .add(new BankRegister(64, 8, X8664Registers.R9)) - .add(new BankRegister(56, 8, X8664Registers.R10)) - .add(new BankRegister(48, 8, X8664Registers.R11)) - .add(new BankRegister(24, 8, X8664Registers.R12)) - .add(new BankRegister(16, 8, X8664Registers.R13)) - .add(new BankRegister(8, 8, X8664Registers.R14)) - .add(new BankRegister(0, 8, X8664Registers.R15)) + .add(new BankRegister(120, 8, X8664Registers.ORIG_RAX)) .add(new BankRegister(128, 8, X8664Registers.RIP)) + .add(new BankRegister(136, 8, X8664Registers.CS)) .add(new BankRegister(144, 8, X8664Registers.RFLAGS)) - .add(new BankRegister(136, 8, "cs")) - .add(new BankRegister(160, 8, "ss")) - .add(new BankRegister(184, 8, "ds")) - .add(new BankRegister(192, 8, "es")) - .add(new BankRegister(200, 8, "fs")) - .add(new BankRegister(208, 8, "gs")) - .add(new BankRegister(120, 8, X8664Registers.ORIG_RAX)) + .add(new BankRegister(152, 8, X8664Registers.RSP)) + .add(new BankRegister(160, 8, X8664Registers.SS)) .add(new BankRegister(168, 8, X8664Registers.FS_BASE)) .add(new BankRegister(176, 8, X8664Registers.GS_BASE)) + .add(new BankRegister(184, 8, X8664Registers.DS)) + .add(new BankRegister(192, 8, X8664Registers.ES)) + .add(new BankRegister(200, 8, X8664Registers.FS)) + .add(new BankRegister(208, 8, X8664Registers.GS)) ; public static final BankRegisterMap FPREGS diff --git a/frysk-core/frysk/bank/X86BankRegisters.java b/frysk-core/frysk/bank/X86BankRegisters.java index 6ad6d4a..f48547a 100644 --- a/frysk-core/frysk/bank/X86BankRegisters.java +++ b/frysk-core/frysk/bank/X86BankRegisters.java @@ -75,12 +75,12 @@ public class X86BankRegisters { .add(IA32Registers.ESI, X8664Registers.RSI) .add(IA32Registers.EDI, X8664Registers.RDI) .add(IA32Registers.EBP, X8664Registers.RBP) - .add("cs", "cs") - .add("ds", "ds") - .add("es", "es") - .add("fs", "fs") - .add("gs", "gs") - .add("ss", "gs") + .add(IA32Registers.CS) + .add(IA32Registers.DS) + .add(IA32Registers.ES) + .add(IA32Registers.FS) + .add(IA32Registers.GS) + .add(IA32Registers.SS) .add(IA32Registers.ORIG_EAX, X8664Registers.ORIG_RAX) .add(IA32Registers.EIP, X8664Registers.RIP) .add(IA32Registers.EFLAGS,X8664Registers.RFLAGS) hooks/post-receive -- frysk system monitor/debugger