* Patch to PowerPC (mainly 32) ISA
@ 2007-11-07 0:27 Jose Flavio Aguilar Paulino
0 siblings, 0 replies; only message in thread
From: Jose Flavio Aguilar Paulino @ 2007-11-07 0:27 UTC (permalink / raw)
To: Frysk
[-- Attachment #1: Type: text/plain, Size: 137 bytes --]
--
Jose Flavio Aguilar Paulino
(jflavio@br.ibm.com)
System / Software Engineer
Toolchain Team
LTC, Linux Technology Center
IBM Brazil
[-- Attachment #2: power_frysk_isa --]
[-- Type: text/x-patch, Size: 12823 bytes --]
Index: frysk/frysk-core/frysk/isa/ISA.java
===================================================================
--- frysk.orig/frysk-core/frysk/isa/ISA.java
+++ frysk/frysk-core/frysk/isa/ISA.java
@@ -71,16 +71,16 @@ public final class ISA {
);
}
+ /*
+ * PowerPC is a Bi-Endian archtecture, it supports little and big
+ * endianness. But, usually (99.9%) it is used as a big endian,
+ * in truth in memory the data is stored always in big-endian format
+ */
public static final ISA PPC32BE
= new ISA(ByteOrder.BIG_ENDIAN, 4, "PowerPC");
public static final ISA PPC64BE
= new ISA(ByteOrder.BIG_ENDIAN, 8, "PowerPC");
- public static final ISA PPC32LE
- = new ISA(ByteOrder.LITTLE_ENDIAN, 4, "PowerPC");
- public static final ISA PPC64LE
- = new ISA(ByteOrder.LITTLE_ENDIAN, 8, "PowerPC");
-
public static final ISA IA32
= new ISA(ByteOrder.LITTLE_ENDIAN, 4, "IA32");
public static final ISA X8664
Index: frysk/frysk-core/frysk/isa/PPC32Registers.java
===================================================================
--- frysk.orig/frysk-core/frysk/isa/PPC32Registers.java
+++ frysk/frysk-core/frysk/isa/PPC32Registers.java
@@ -108,76 +108,128 @@ public class PPC32Registers extends Regi
public static final Register GPR31
= new Register("gpr31", StandardTypes.INT32B_T);
+ /* Special registers */
+
+ public static final Register CTR
+ = new Register("counterreg", StandardTypes.INT32B_T);
+ public static final Register XER
+ = new Register("fixedstatuscontrolreg", StandardTypes.INT32B_T);
+ public static final Register CCR
+ = new Register("conditionreg", StandardTypes.INT32B_T);
+ public static final Register LR
+ = new Register("linkreg", StandardTypes.VOIDPTR32B_T);
+ public static final Register FPSCR
+ = new Register("floatingstatuscontrolreg", StandardTypes.INT32B_T);
+
public static final Register FPR0
- = new Register("fpr0", StandardTypes.FLOAT64B_T);
+ = new Register("fpr0", StandardTypes.FLOAT64B_T);
public static final Register FPR1
- = new Register("fpr1", StandardTypes.FLOAT64B_T);
+ = new Register("fpr1", StandardTypes.FLOAT64B_T);
public static final Register FPR2
- = new Register("fpr2", StandardTypes.FLOAT64B_T);
+ = new Register("fpr2", StandardTypes.FLOAT64B_T);
public static final Register FPR3
- = new Register("fpr3", StandardTypes.FLOAT64B_T);
+ = new Register("fpr3", StandardTypes.FLOAT64B_T);
public static final Register FPR4
- = new Register("fpr4", StandardTypes.FLOAT64B_T);
+ = new Register("fpr4", StandardTypes.FLOAT64B_T);
public static final Register FPR5
- = new Register("fpr5", StandardTypes.FLOAT64B_T);
+ = new Register("fpr5", StandardTypes.FLOAT64B_T);
public static final Register FPR6
- = new Register("fpr6", StandardTypes.FLOAT64B_T);
+ = new Register("fpr6", StandardTypes.FLOAT64B_T);
public static final Register FPR7
- = new Register("fpr7", StandardTypes.FLOAT64B_T);
+ = new Register("fpr7", StandardTypes.FLOAT64B_T);
public static final Register FPR8
- = new Register("fpr8", StandardTypes.FLOAT64B_T);
+ = new Register("fpr8", StandardTypes.FLOAT64B_T);
public static final Register FPR9
- = new Register("fpr9", StandardTypes.FLOAT64B_T);
+ = new Register("fpr9", StandardTypes.FLOAT64B_T);
public static final Register FPR10
- = new Register("fpr10", StandardTypes.FLOAT64B_T);
+ = new Register("fpr10", StandardTypes.FLOAT64B_T);
public static final Register FPR11
- = new Register("fpr11", StandardTypes.FLOAT64B_T);
+ = new Register("fpr11", StandardTypes.FLOAT64B_T);
public static final Register FPR12
- = new Register("fpr12", StandardTypes.FLOAT64B_T);
+ = new Register("fpr12", StandardTypes.FLOAT64B_T);
public static final Register FPR13
- = new Register("fpr13", StandardTypes.FLOAT64B_T);
+ = new Register("fpr13", StandardTypes.FLOAT64B_T);
public static final Register FPR14
- = new Register("fpr14", StandardTypes.FLOAT64B_T);
+ = new Register("fpr14", StandardTypes.FLOAT64B_T);
public static final Register FPR15
- = new Register("fpr15", StandardTypes.FLOAT64B_T);
+ = new Register("fpr15", StandardTypes.FLOAT64B_T);
public static final Register FPR16
- = new Register("fpr16", StandardTypes.FLOAT64B_T);
+ = new Register("fpr16", StandardTypes.FLOAT64B_T);
public static final Register FPR17
- = new Register("fpr17", StandardTypes.FLOAT64B_T);
+ = new Register("fpr17", StandardTypes.FLOAT64B_T);
public static final Register FPR18
- = new Register("fpr18", StandardTypes.FLOAT64B_T);
+ = new Register("fpr18", StandardTypes.FLOAT64B_T);
public static final Register FPR19
- = new Register("fpr19", StandardTypes.FLOAT64B_T);
+ = new Register("fpr19", StandardTypes.FLOAT64B_T);
public static final Register FPR20
- = new Register("fpr20", StandardTypes.FLOAT64B_T);
+ = new Register("fpr20", StandardTypes.FLOAT64B_T);
public static final Register FPR21
- = new Register("fpr21", StandardTypes.FLOAT64B_T);
+ = new Register("fpr21", StandardTypes.FLOAT64B_T);
public static final Register FPR22
- = new Register("fpr22", StandardTypes.FLOAT64B_T);
+ = new Register("fpr22", StandardTypes.FLOAT64B_T);
public static final Register FPR23
- = new Register("fpr23", StandardTypes.FLOAT64B_T);
+ = new Register("fpr23", StandardTypes.FLOAT64B_T);
public static final Register FPR24
- = new Register("fpr24", StandardTypes.FLOAT64B_T);
+ = new Register("fpr24", StandardTypes.FLOAT64B_T);
public static final Register FPR25
- = new Register("fpr25", StandardTypes.FLOAT64B_T);
+ = new Register("fpr25", StandardTypes.FLOAT64B_T);
public static final Register FPR26
- = new Register("fpr26", StandardTypes.FLOAT64B_T);
+ = new Register("fpr26", StandardTypes.FLOAT64B_T);
public static final Register FPR27
- = new Register("fpr27", StandardTypes.FLOAT64B_T);
+ = new Register("fpr27", StandardTypes.FLOAT64B_T);
public static final Register FPR28
- = new Register("fpr28", StandardTypes.FLOAT64B_T);
+ = new Register("fpr28", StandardTypes.FLOAT64B_T);
public static final Register FPR29
- = new Register("fpr29", StandardTypes.FLOAT64B_T);
+ = new Register("fpr29", StandardTypes.FLOAT64B_T);
public static final Register FPR30
- = new Register("fpr30", StandardTypes.FLOAT64B_T);
+ = new Register("fpr30", StandardTypes.FLOAT64B_T);
public static final Register FPR31
- = new Register("fpr31", StandardTypes.FLOAT64B_T);
+ = new Register("fpr31", StandardTypes.FLOAT64B_T);
- public static final Register NIP
- = new Register("nip", StandardTypes.VOIDPTR32B_T);
+ public static final RegisterGroup GENERAL
+ = new RegisterGroup("general",
+ new Register[] {
+ GPR0 , GPR1 , GPR2 , GPR3 , GPR4 , GPR5 , GPR6 , GPR7 , GPR8 , GPR9 ,
+ GPR10, GPR11, GPR12, GPR13, GPR14, GPR15, GPR16, GPR17, GPR18, GPR19,
+ GPR20, GPR21, GPR22, GPR23, GPR24, GPR25, GPR26, GPR27, GPR28, GPR29,
+ GPR30, GPR31 });
+
+ public static final RegisterGroup SPECIAL
+ = new RegisterGroup("special",
+ new Register[] { CTR, XER, CCR, LR, FPSCR });
+
+ public static final RegisterGroup FLOATING_POINTER
+ = new RegisterGroup("floatingpointer",
+ new Register[] {
+ FPR0 , FPR1 , FPR2 , FPR3 , FPR4 , FPR5 , FPR6 , FPR7 , FPR8 , FPR9 ,
+ FPR10, FPR11, FPR12, FPR13, FPR14, FPR15, FPR16, FPR17, FPR18, FPR19,
+ FPR20, FPR21, FPR22, FPR23, FPR24, FPR25, FPR26, FPR27, FPR28, FPR29,
+ FPR30, FPR31 });
+
+ public static final RegisterGroup ALL;
+ static {
+ Register[] allRegs = new Register[
+ GENERAL.getRegisters().length +
+ SPECIAL.getRegisters().length +
+ FLOATING_POINTER.getRegisters().length];
+
+ System.arraycopy(GENERAL.getRegisters(), 0,
+ allRegs, 0,
+ GENERAL.getRegisters().length);
+
+ System.arraycopy(SPECIAL.getRegisters(), 0,
+ allRegs, GENERAL.getRegisters().length,
+ SPECIAL.getRegisters().length);
+
+ System.arraycopy(FLOATING_POINTER.getRegisters(), 0,
+ allRegs, GENERAL.getRegisters().length + SPECIAL.getRegisters().length,
+ FLOATING_POINTER.getRegisters().length);
+
+ ALL = new RegisterGroup("all", allRegs);
+ }
public Register getProgramCounter() {
- return NIP;
+ return LR;
}
public Register getStackPointer() {
@@ -185,17 +237,14 @@ public class PPC32Registers extends Regi
}
public RegisterGroup getDefaultRegisterGroup() {
- // FIXME!
- return null;
+ return GENERAL;
}
public RegisterGroup getAllRegistersGroup() {
- // FIXME!
- return null;
+ return ALL;
}
PPC32Registers() {
- // FIXME!
- super(null);
+ super(new RegisterGroup[] { GENERAL, SPECIAL, FLOATING_POINTER, ALL });
}
}
Index: frysk/frysk-core/frysk/proc/IsaPowerPC.java
===================================================================
--- frysk.orig/frysk-core/frysk/proc/IsaPowerPC.java
+++ frysk/frysk-core/frysk/proc/IsaPowerPC.java
@@ -49,24 +49,24 @@ import frysk.isa.Register;
import inua.eio.ByteOrder;
abstract class IsaPowerPC implements Isa {
- private final Register NIP;
+ private final Register PC;
- protected IsaPowerPC(Register NIP) {
- this.NIP = NIP;
+ protected IsaPowerPC(Register PC) {
+ this.PC = PC;
}
- // the illegal instruction for powerpc: 0x7d821008.
- // the default order is BIG_ENDIAN
- protected static final Instruction ppcBreakpoint
- = new Instruction(new byte[] { (byte)0x7d, (byte)0x82,
- (byte)0x10, (byte)0x08 }, false);
+ // the illegal instruction for powerpc: 0x7d821008.
+ // the default order is BIG_ENDIAN
+ protected static final Instruction ppcBreakpoint =
+ new Instruction(new byte[] { (byte)0x7d, (byte)0x82,
+ (byte)0x10, (byte)0x08 }, false);
public long pc (Task task) {
- return task.getRegister(NIP);
+ return task.getRegister(PC);
}
public void setPC (Task task, long address) {
- task.setRegister(NIP, address);
+ task.setRegister(PC, address);
}
/**
@@ -110,7 +110,6 @@ abstract class IsaPowerPC implements Isa
* Get the true breakpoint address according to PC register after hitting
* one breakpoint set in task. In PowerPC, the PC register's value will
* remain unchanged.
- *
*/
public final long getBreakpointAddress(Task task)
{
Index: frysk/frysk-core/frysk/proc/LinuxPPC.java
===================================================================
--- frysk.orig/frysk-core/frysk/proc/LinuxPPC.java
+++ frysk/frysk-core/frysk/proc/LinuxPPC.java
@@ -48,7 +48,8 @@ import frysk.isa.PPC32Registers;
class LinuxPPC extends IsaPowerPC implements SyscallEventDecoder {
LinuxPPC() {
- super(PPC32Registers.NIP);
+ //In Power32 the PC will be in Link Register
+ super(PPC32Registers.LR);
}
private static Logger logger = Logger.getLogger(ProcLogger.LOGGER_ID);
Index: frysk/frysk-core/frysk/proc/PPCBankRegisters.java
===================================================================
--- frysk.orig/frysk-core/frysk/proc/PPCBankRegisters.java
+++ frysk/frysk-core/frysk/proc/PPCBankRegisters.java
@@ -79,18 +79,18 @@ public class PPCBankRegisters {
.add(new BankRegister(0, 116, 4, PPC32Registers.GPR29))
.add(new BankRegister(0, 120, 4, PPC32Registers.GPR30))
.add(new BankRegister(0, 124, 4, PPC32Registers.GPR31))
- .add(new BankRegister(0, 128, 4, PPC32Registers.NIP))
+ .add(new BankRegister(0, 128, 4, "result"))
.add(new BankRegister(0, 132, 4, "msr"))
.add(new BankRegister(0, 136, 4, "orig_r3"))
- .add(new BankRegister(0, 140, 4, "ctr"))
- .add(new BankRegister(0, 144, 4, "lnk"))
- .add(new BankRegister(0, 148, 4, "xer"))
- .add(new BankRegister(0, 152, 4, "ccr"))
- .add(new BankRegister(0, 156, 4, "mq"))
+ .add(new BankRegister(0, 140, 4, PPC32Registers.CTR))
+ .add(new BankRegister(0, 144, 4, PPC32Registers.LR))
+ .add(new BankRegister(0, 148, 4, PPC32Registers.XER))
+ .add(new BankRegister(0, 152, 4, PPC32Registers.CCR))
+ .add(new BankRegister(0, 156, 4, PPC32Registers.FPSCR))
.add(new BankRegister(0, 160, 4, "trap"))
.add(new BankRegister(0, 164, 4, "dar"))
.add(new BankRegister(0, 168, 4, "dsisr"))
- .add(new BankRegister(0, 172, 4, "result"))
+ .add(new BankRegister(0, 172, 4, "mq"))
.add(new BankRegister(0, 192, 8, PPC32Registers.FPR0))
.add(new BankRegister(0, 200, 8, PPC32Registers.FPR1))
.add(new BankRegister(0, 208, 8, PPC32Registers.FPR2))
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-07 0:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-07 0:27 Patch to PowerPC (mainly 32) ISA Jose Flavio Aguilar Paulino
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).