Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added extra x86-64 registers and a abi field. #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added extra x86-64 registers and a abi field. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2791bf
Add the registers added in x86-64.
rupertsteel Sep 30, 2019
0bd195e
Add a windows target.
rupertsteel Sep 30, 2019
3830aee
Added a abi field to handle multiple targets that share a abi.
rupertsteel Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 71 additions & 2 deletions src/jx86/lang/Register.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ public static String suffix(Register.Width width) {
public static final Register CH = new Register("ch", Width.Byte);
public static final Register DL = new Register("dl", Width.Byte);
public static final Register DH = new Register("dh", Width.Byte);

public static final Register R8b = new Register("r8b", Width.Quad);
public static final Register R9b = new Register("r9b", Width.Quad);
public static final Register R10b = new Register("r10b", Width.Quad);
public static final Register R11b = new Register("r11b", Width.Quad);
public static final Register R12b = new Register("r12b", Width.Quad);
public static final Register R13b = new Register("r13b", Width.Quad);
public static final Register R14b = new Register("r14b", Width.Quad);
public static final Register R15b = new Register("r15b", Width.Quad);

// x86_16
public static final Register AX = new Register("ax", Width.Word);
Expand All @@ -120,6 +129,15 @@ public static String suffix(Register.Width width) {
public static final Register BP = new Register("bp", Width.Word);
public static final Register SP = new Register("sp", Width.Word);
public static final Register IP = new Register("ip", Width.Word);

public static final Register R8w = new Register("r8w", Width.Quad);
public static final Register R9w = new Register("r9w", Width.Quad);
public static final Register R10w = new Register("r10w", Width.Quad);
public static final Register R11w = new Register("r11w", Width.Quad);
public static final Register R12w = new Register("r12w", Width.Quad);
public static final Register R13w = new Register("r13w", Width.Quad);
public static final Register R14w = new Register("r14w", Width.Quad);
public static final Register R15w = new Register("r15w", Width.Quad);

// x86_32
public static final Register EAX = new Register("eax", Width.Long);
Expand All @@ -131,6 +149,15 @@ public static String suffix(Register.Width width) {
public static final Register EBP = new Register("ebp", Width.Long);
public static final Register ESP = new Register("esp", Width.Long);
public static final Register EIP = new Register("eip", Width.Long);

public static final Register R8d = new Register("r8d", Width.Quad);
public static final Register R9d = new Register("r9d", Width.Quad);
public static final Register R10d = new Register("r10d", Width.Quad);
public static final Register R11d = new Register("r11d", Width.Quad);
public static final Register R12d = new Register("r12d", Width.Quad);
public static final Register R13d = new Register("r13d", Width.Quad);
public static final Register R14d = new Register("r14d", Width.Quad);
public static final Register R15d = new Register("r15d", Width.Quad);

// x86_64
public static final Register RAX = new Register("rax", Width.Quad);
Expand All @@ -142,7 +169,16 @@ public static String suffix(Register.Width width) {
public static final Register RBP = new Register("rbp", Width.Quad);
public static final Register RSP = new Register("rsp", Width.Quad);
public static final Register RIP = new Register("rip", Width.Quad);


public static final Register R8 = new Register("r8", Width.Quad);
public static final Register R9 = new Register("r9", Width.Quad);
public static final Register R10 = new Register("r10", Width.Quad);
public static final Register R11 = new Register("r11", Width.Quad);
public static final Register R12 = new Register("r12", Width.Quad);
public static final Register R13 = new Register("r13", Width.Quad);
public static final Register R14 = new Register("r14", Width.Quad);
public static final Register R15 = new Register("r15", Width.Quad);

// Streaming SIMD Extensions (SSE)
public static final Register XMM0 = new Register("xmm0", Width.ScalarDouble);
public static final Register XMM1 = new Register("xmm1", Width.ScalarDouble);
Expand Down Expand Up @@ -181,6 +217,31 @@ public static String suffix(Register.Width width) {
public static final Register[] IP_FAMILY = {
Register.IP,Register.EIP,Register.RIP
};

public static final Register[] R8_FAMILY = {
Register.R8b, Register.R8w, Register.R8d, Register.R8
};
public static final Register[] R9_FAMILY = {
Register.R9b, Register.R9w, Register.R9d, Register.R9
};
public static final Register[] R10_FAMILY = {
Register.R10b, Register.R10w, Register.R10d, Register.R10
};
public static final Register[] R11_FAMILY = {
Register.R11b, Register.R11w, Register.R11d, Register.R11
};
public static final Register[] R12_FAMILY = {
Register.R12b, Register.R12w, Register.R12d, Register.R12
};
public static final Register[] R13_FAMILY = {
Register.R13b, Register.R13w, Register.R13d, Register.R13
};
public static final Register[] R14_FAMILY = {
Register.R14b, Register.R14w, Register.R14d, Register.R14
};
public static final Register[] R15_FAMILY = {
Register.R15b, Register.R15w, Register.R15d, Register.R15
};

public static final Register[][] ALL_FAMILIES = {
AX_FAMILY,
Expand All @@ -191,7 +252,15 @@ public static String suffix(Register.Width width) {
SI_FAMILY,
BP_FAMILY,
SP_FAMILY,
IP_FAMILY
IP_FAMILY,
R8_FAMILY,
R9_FAMILY,
R10_FAMILY,
R11_FAMILY,
R12_FAMILY,
R13_FAMILY,
R14_FAMILY,
R15_FAMILY
};

// ============================================
Expand Down
16 changes: 11 additions & 5 deletions src/jx86/lang/Target.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ public final class Target {
// Enums & Constants
// ============================================

public static final Target MACOS_X86_64 = new Target(OS.MACOS,Arch.X86_64);

public static final Target LINUX_X86_64 = new Target(OS.LINUX,Arch.X86_64);
public static final Target MACOS_X86_64 = new Target(OS.MACOS,Arch.X86_64, ABI.SystemV);

public static final Target LINUX_X86_64 = new Target(OS.LINUX,Arch.X86_64, ABI.SystemV);

public static final Target WINDOWS_X86_64 = new Target(OS.WINDOWS, Arch.X86_64, ABI.Windows);
/**
* The set of supported operating systems.
*
* @author David J. Pearce
*
*/
public enum OS {
LINUX, MACOS
LINUX, MACOS, WINDOWS
}

/**
Expand All @@ -38,21 +38,27 @@ public enum OS {
public enum Arch {
X86_32, X86_64
}

public enum ABI {
SystemV, Windows
}

// ============================================
// Fields
// ============================================

public final OS os;
public final Arch arch;
public final ABI abi;

// ============================================
// Constructors
// ============================================

private Target(OS os, Arch arch) {
private Target(OS os, Arch arch, ABI abi) {
this.os = os;
this.arch = arch;
this.abi = abi;
}

/**
Expand Down