Skip to content

Commit

Permalink
microblaze: Add .type and .size to ASM functions
Browse files Browse the repository at this point in the history
Cachegrind analysis need this fix to be able to log asm functions.

Signed-off-by: Michal Simek <monstr@monstr.eu>
  • Loading branch information
Michal Simek committed Apr 1, 2010
1 parent e84452d commit 1385196
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
11 changes: 11 additions & 0 deletions arch/microblaze/kernel/misc.S
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* We avoid flushing the pinned 0, 1 and possibly 2 entries.
*/
.globl _tlbia;
.type _tlbia, @function
.align 4;
_tlbia:
addik r12, r0, 63 /* flush all entries (63 - 3) */
Expand All @@ -41,11 +42,13 @@ _tlbia_1:
/* sync */
rtsd r15, 8
nop
.size _tlbia, . - _tlbia

/*
* Flush MMU TLB for a particular address (in r5)
*/
.globl _tlbie;
.type _tlbie, @function
.align 4;
_tlbie:
mts rtlbsx, r5 /* look up the address in TLB */
Expand All @@ -59,10 +62,13 @@ _tlbie_1:
rtsd r15, 8
nop

.size _tlbie, . - _tlbie

/*
* Allocate TLB entry for early console
*/
.globl early_console_reg_tlb_alloc;
.type early_console_reg_tlb_alloc, @function
.align 4;
early_console_reg_tlb_alloc:
/*
Expand All @@ -86,6 +92,8 @@ early_console_reg_tlb_alloc:
rtsd r15, 8
nop

.size early_console_reg_tlb_alloc, . - early_console_reg_tlb_alloc

/*
* Copy a whole page (4096 bytes).
*/
Expand All @@ -104,6 +112,7 @@ early_console_reg_tlb_alloc:
#define DCACHE_LINE_BYTES (4 * 4)

.globl copy_page;
.type copy_page, @function
.align 4;
copy_page:
ori r11, r0, (PAGE_SIZE/DCACHE_LINE_BYTES) - 1
Expand All @@ -118,3 +127,5 @@ _copy_page_loop:
addik r11, r11, -1
rtsd r15, 8
nop

.size copy_page, . - copy_page
6 changes: 5 additions & 1 deletion arch/microblaze/lib/fastcopy.S
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@
*/

#include <linux/linkage.h>

.text
.globl memcpy
.type memcpy, @function
.ent memcpy

memcpy:
Expand Down Expand Up @@ -345,9 +346,11 @@ a_done:
rtsd r15, 8
nop

.size memcpy, . - memcpy
.end memcpy
/*----------------------------------------------------------------------------*/
.globl memmove
.type memmove, @function
.ent memmove

memmove:
Expand Down Expand Up @@ -659,4 +662,5 @@ d_done:
rtsd r15, 8
nop

.size memmove, . - memmove
.end memmove
6 changes: 6 additions & 0 deletions arch/microblaze/lib/uaccess_old.S
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

.text
.globl __strncpy_user;
.type __strncpy_user, @function
.align 4;
__strncpy_user:

Expand Down Expand Up @@ -50,6 +51,7 @@ __strncpy_user:
3:
rtsd r15,8
nop
.size __strncpy_user, . - __strncpy_user


.section .fixup, "ax"
Expand All @@ -72,6 +74,7 @@ __strncpy_user:

.text
.globl __strnlen_user;
.type __strnlen_user, @function
.align 4;
__strnlen_user:
addik r3,r6,0
Expand All @@ -90,6 +93,7 @@ __strnlen_user:
3:
rtsd r15,8
nop
.size __strnlen_user, . - __strnlen_user


.section .fixup,"ax"
Expand All @@ -108,6 +112,7 @@ __strnlen_user:
*/
.text
.globl __copy_tofrom_user;
.type __copy_tofrom_user, @function
.align 4;
__copy_tofrom_user:
/*
Expand All @@ -129,6 +134,7 @@ __copy_tofrom_user:
3:
rtsd r15,8
nop
.size __copy_tofrom_user, . - __copy_tofrom_user


.section __ex_table,"a"
Expand Down

0 comments on commit 1385196

Please sign in to comment.