aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2009-01-18 12:13:53 -0500
committerKyle McMartin <kyle@treachery.i.cabal.ca>2009-03-13 01:18:27 -0400
commit2cfeb9a6755d4d7be1026422b6aced48e3bad492 (patch)
tree0ca39b8fa71b174bfc907d1b259e1470c45e0ccd /arch
parent7f384ce780c6091968fc848b14f17b45cb849e14 (diff)
parisc: add braces around arguments in assembler macros
Add braces around the macro arguments, else for example "shl %r1, 5-3, %r2" would not expand to what you would assume. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/include/asm/assembly.h10
-rw-r--r--arch/parisc/kernel/entry.S6
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h
index ffb208840ecc..ab7cc373ee56 100644
--- a/arch/parisc/include/asm/assembly.h
+++ b/arch/parisc/include/asm/assembly.h
@@ -129,27 +129,27 @@
129 129
130 /* Shift Left - note the r and t can NOT be the same! */ 130 /* Shift Left - note the r and t can NOT be the same! */
131 .macro shl r, sa, t 131 .macro shl r, sa, t
132 dep,z \r, 31-\sa, 32-\sa, \t 132 dep,z \r, 31-(\sa), 32-(\sa), \t
133 .endm 133 .endm
134 134
135 /* The PA 2.0 shift left */ 135 /* The PA 2.0 shift left */
136 .macro shlw r, sa, t 136 .macro shlw r, sa, t
137 depw,z \r, 31-\sa, 32-\sa, \t 137 depw,z \r, 31-(\sa), 32-(\sa), \t
138 .endm 138 .endm
139 139
140 /* And the PA 2.0W shift left */ 140 /* And the PA 2.0W shift left */
141 .macro shld r, sa, t 141 .macro shld r, sa, t
142 depd,z \r, 63-\sa, 64-\sa, \t 142 depd,z \r, 63-(\sa), 64-(\sa), \t
143 .endm 143 .endm
144 144
145 /* Shift Right - note the r and t can NOT be the same! */ 145 /* Shift Right - note the r and t can NOT be the same! */
146 .macro shr r, sa, t 146 .macro shr r, sa, t
147 extru \r, 31-\sa, 32-\sa, \t 147 extru \r, 31-(\sa), 32-(\sa), \t
148 .endm 148 .endm
149 149
150 /* pa20w version of shift right */ 150 /* pa20w version of shift right */
151 .macro shrd r, sa, t 151 .macro shrd r, sa, t
152 extrd,u \r, 63-\sa, 64-\sa, \t 152 extrd,u \r, 63-(\sa), 64-(\sa), \t
153 .endm 153 .endm
154 154
155 /* load 32-bit 'value' into 'reg' compensating for the ldil 155 /* load 32-bit 'value' into 'reg' compensating for the ldil
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index d1fa4edd2d80..0db9fdcb7709 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -368,7 +368,7 @@
368 * abstractions for the macros */ 368 * abstractions for the macros */
369 .macro EXTR reg1,start,length,reg2 369 .macro EXTR reg1,start,length,reg2
370#ifdef CONFIG_64BIT 370#ifdef CONFIG_64BIT
371 extrd,u \reg1,32+\start,\length,\reg2 371 extrd,u \reg1,32+(\start),\length,\reg2
372#else 372#else
373 extrw,u \reg1,\start,\length,\reg2 373 extrw,u \reg1,\start,\length,\reg2
374#endif 374#endif
@@ -376,7 +376,7 @@
376 376
377 .macro DEP reg1,start,length,reg2 377 .macro DEP reg1,start,length,reg2
378#ifdef CONFIG_64BIT 378#ifdef CONFIG_64BIT
379 depd \reg1,32+\start,\length,\reg2 379 depd \reg1,32+(\start),\length,\reg2
380#else 380#else
381 depw \reg1,\start,\length,\reg2 381 depw \reg1,\start,\length,\reg2
382#endif 382#endif
@@ -384,7 +384,7 @@
384 384
385 .macro DEPI val,start,length,reg 385 .macro DEPI val,start,length,reg
386#ifdef CONFIG_64BIT 386#ifdef CONFIG_64BIT
387 depdi \val,32+\start,\length,\reg 387 depdi \val,32+(\start),\length,\reg
388#else 388#else
389 depwi \val,\start,\length,\reg 389 depwi \val,\start,\length,\reg
390#endif 390#endif