lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parisc: add braces around arguments in assembler macros

Browse Source 
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>
This commit is contained in:
Helge Deller
2009-01-18 18:13:53 +01:00
committed by Kyle McMartin
parent 7f384ce780
commit 2cfeb9a675
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/parisc/include/asm/assembly.h
View File

@@ -129,27 +129,27 @@
/* Shift Left - note the r and t can NOT be the same! */ /* Shift Left - note the r and t can NOT be the same! */
.macro shl r, sa, t .macro shl r, sa, t
dep,z \r, 31-\sa, 32-\sa, \t dep,z \r, 31-(\sa), 32-(\sa), \t
.endm .endm
/* The PA 2.0 shift left */ /* The PA 2.0 shift left */
.macro shlw r, sa, t .macro shlw r, sa, t
depw,z \r, 31-\sa, 32-\sa, \t depw,z \r, 31-(\sa), 32-(\sa), \t
.endm .endm
/* And the PA 2.0W shift left */ /* And the PA 2.0W shift left */
.macro shld r, sa, t .macro shld r, sa, t
depd,z \r, 63-\sa, 64-\sa, \t depd,z \r, 63-(\sa), 64-(\sa), \t
.endm .endm
/* Shift Right - note the r and t can NOT be the same! */ /* Shift Right - note the r and t can NOT be the same! */
.macro shr r, sa, t .macro shr r, sa, t
extru \r, 31-\sa, 32-\sa, \t extru \r, 31-(\sa), 32-(\sa), \t
.endm .endm
/* pa20w version of shift right */ /* pa20w version of shift right */
.macro shrd r, sa, t .macro shrd r, sa, t
extrd,u \r, 63-\sa, 64-\sa, \t extrd,u \r, 63-(\sa), 64-(\sa), \t
.endm .endm
/* load 32-bit 'value' into 'reg' compensating for the ldil /* load 32-bit 'value' into 'reg' compensating for the ldil

6
arch/parisc/kernel/entry.S
View File

@@ -368,7 +368,7 @@
* abstractions for the macros */ * abstractions for the macros */
.macro EXTR reg1,start,length,reg2 .macro EXTR reg1,start,length,reg2
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
extrd,u \reg1,32+\start,\length,\reg2 extrd,u \reg1,32+(\start),\length,\reg2
#else #else
extrw,u \reg1,\start,\length,\reg2 extrw,u \reg1,\start,\length,\reg2
#endif #endif
@@ -376,7 +376,7 @@
.macro DEP reg1,start,length,reg2 .macro DEP reg1,start,length,reg2
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
depd \reg1,32+\start,\length,\reg2 depd \reg1,32+(\start),\length,\reg2
#else #else
depw \reg1,\start,\length,\reg2 depw \reg1,\start,\length,\reg2
#endif #endif
@@ -384,7 +384,7 @@
.macro DEPI val,start,length,reg .macro DEPI val,start,length,reg
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
depdi \val,32+\start,\length,\reg depdi \val,32+(\start),\length,\reg
#else #else
depwi \val,\start,\length,\reg depwi \val,\start,\length,\reg
#endif #endif