Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313652
b: refs/heads/master
c: 564aa5c
h: refs/heads/master
v: v3
  • Loading branch information
Michael Neuling authored and Benjamin Herrenschmidt committed Jul 10, 2012
1 parent a8c0c02 commit ab03ae0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 82fff310f18e274a8e3f0aff5669928ab45c8dab
refs/heads/master: 564aa5cfd3e33ef69a5ca6c170a0fe79c6805e52
18 changes: 9 additions & 9 deletions trunk/arch/powerpc/include/asm/ppc_asm.h
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,14 @@ GLUE(.,name):
*/
#ifdef __powerpc64__
#define LOAD_REG_IMMEDIATE(reg,expr) \
lis (reg),(expr)@highest; \
ori (reg),(reg),(expr)@higher; \
rldicr (reg),(reg),32,31; \
oris (reg),(reg),(expr)@h; \
ori (reg),(reg),(expr)@l;
lis reg,(expr)@highest; \
ori reg,reg,(expr)@higher; \
rldicr reg,reg,32,31; \
oris reg,reg,(expr)@h; \
ori reg,reg,(expr)@l;

#define LOAD_REG_ADDR(reg,name) \
ld (reg),name@got(r2)
ld reg,name@got(r2)

#define LOAD_REG_ADDRBASE(reg,name) LOAD_REG_ADDR(reg,name)
#define ADDROFF(name) 0
Expand All @@ -313,12 +313,12 @@ GLUE(.,name):
#else /* 32-bit */

#define LOAD_REG_IMMEDIATE(reg,expr) \
lis (reg),(expr)@ha; \
addi (reg),(reg),(expr)@l;
lis reg,(expr)@ha; \
addi reg,reg,(expr)@l;

#define LOAD_REG_ADDR(reg,name) LOAD_REG_IMMEDIATE(reg, name)

#define LOAD_REG_ADDRBASE(reg, name) lis (reg),name@ha
#define LOAD_REG_ADDRBASE(reg, name) lis reg,name@ha
#define ADDROFF(name) name@l

/* offsets for stack frame layout */
Expand Down

0 comments on commit ab03ae0

Please sign in to comment.