Skip to content

L
linux
Commit 912c173d authored by Brian Gerst's avatar Brian Gerst Committed by Jaroslav Kysela
Browse files
Options

[PATCH] Removing SYMBOL_NAME part 4 

m68k arch
parent e64a5d08
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 426 additions and 426 deletions
arch/m68k/atari/ataints.c
View file @ 912c173d
......@@ -168,8 +168,8 @@ asmlinkage void IRQ_NAME(n); \
/* Dummy function to allow asm with operands. */ \
void atari_slow_irq_##n##_dummy (void) { \
__asm__ (__ALIGN_STR "\n" \
SYMBOL_NAME_STR(atari_slow_irq_) #n "_handler:\t" \
" addql #1,"SYMBOL_NAME_STR(irq_stat)"+8\n" /* local_irq_count */ \
"atari_slow_irq_" #n "_handler:\t" \
" addql #1,irq_stat+8\n" /* local_irq_count */ \
SAVE_ALL_INT "\n" \
GET_CURRENT(%%d0) "\n" \
" andb #~(1<<(%c3&7)),%a4:w\n" /* mask this interrupt */ \
......@@ -190,7 +190,7 @@ SYMBOL_NAME_STR(atari_slow_irq_) #n "_handler:\t" \
" orw #0x0600,%%sr\n" \
" andw #0xfeff,%%sr\n" /* set IPL = 6 again */ \
" orb #(1<<(%c3&7)),%a4:w\n" /* now unmask the int again */ \
" jbra "SYMBOL_NAME_STR(ret_from_interrupt)"\n" \
" jbra ret_from_interrupt\n" \
: : "i" (&kstat.irqs[0][n+8]), "i" (&irq_handler[n+8]), \
"n" (PT_OFF_SR), "n" (n), \
"i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &mfp.int_mk_a) \
......@@ -272,10 +272,10 @@ asmlinkage void atari_prio_irq_handler( void );
/* Dummy function to allow asm with operands. */
void atari_fast_prio_irq_dummy (void) {
__asm__ (__ALIGN_STR "\n"
SYMBOL_NAME_STR(atari_fast_irq_handler) ":
"atari_fast_irq_handler:
orw #0x700,%%sr /* disable all interrupts */
"SYMBOL_NAME_STR(atari_prio_irq_handler) ":\t
addql #1,"SYMBOL_NAME_STR(irq_stat)"+8\n" /* local_irq_count */
atari_prio_irq_handler:\t
addql #1,irq_stat+8\n" /* local_irq_count */
SAVE_ALL_INT "\n"
GET_CURRENT(%%d0) "
/* get vector number from stack frame and convert to source */
......@@ -285,7 +285,7 @@ SYMBOL_NAME_STR(atari_fast_irq_handler) ":
addw #(0x40-8-0x18),%%d0
1: lea %a0,%%a0
addql #1,%%a0@(%%d0:l:4)
lea "SYMBOL_NAME_STR(irq_handler)",%%a0
lea irq_handler,%%a0
lea %%a0@(%%d0:l:8),%%a0
pea %%sp@ /* push frame address */
movel %%a0@(4),%%sp@- /* push handler data */
......@@ -294,7 +294,7 @@ SYMBOL_NAME_STR(atari_fast_irq_handler) ":
jsr %%a0@ /* and call the handler */
addql #8,%%sp
addql #4,%%sp
jbra "SYMBOL_NAME_STR(ret_from_interrupt)
jbra ret_from_interrupt"
: : "i" (&kstat.irqs[0]), "n" (PT_OFF_FORMATVEC)
);
}
......@@ -306,7 +306,7 @@ SYMBOL_NAME_STR(atari_fast_irq_handler) ":
asmlinkage void falcon_hblhandler(void);
asm(".text\n"
__ALIGN_STR "\n"
SYMBOL_NAME_STR(falcon_hblhandler) ":
"falcon_hblhandler:
orw #0x200,%sp@ /* set saved ipl to 2 */
rte");
......
arch/m68k/fpsp040/skeleton.S
View file @ 912c173d
......@@ -73,9 +73,9 @@ real_dz:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| Inexact exception
......@@ -164,9 +164,9 @@ inex_done:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| Overflow exception
......@@ -190,9 +190,9 @@ ovfl_done:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| Underflow exception
......@@ -216,9 +216,9 @@ unfl_done:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| Signalling NAN exception
......@@ -238,9 +238,9 @@ real_snan:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| Operand Error exception
......@@ -260,9 +260,9 @@ real_operr:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
......@@ -288,9 +288,9 @@ real_bsun:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| F-line exception
......@@ -309,9 +309,9 @@ real_fline:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| Unsupported data type exception
......@@ -331,9 +331,9 @@ real_unsupp:
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl SYMBOL_NAME(trap_c)
bsrl trap_c
addql #4,%sp
bral SYMBOL_NAME(ret_from_exception)
bral ret_from_exception
|
| Trace exception
......@@ -341,7 +341,7 @@ real_unsupp:
.global real_trace
real_trace:
|
bral SYMBOL_NAME(trap)
bral trap
|
| fpsp_fmt_error --- exit point for frame format error
......@@ -382,7 +382,7 @@ fpsp_done:
SAVE_ALL_INT
GET_CURRENT(%d0)
tstl %curptr@(TASK_NEEDRESCHED)
jne SYMBOL_NAME(ret_from_exception) | deliver signals,
jne ret_from_exception | deliver signals,
| reschedule etc..
RESTORE_ALL
......@@ -505,7 +505,7 @@ in_ea:
.section .fixup,#alloc,#execinstr
.even
1:
jbra SYMBOL_NAME(fpsp040_die)
jbra fpsp040_die
.section __ex_table,#alloc
.align 4
......
arch/m68k/ifpsp060/fskeleton.S
View file @ 912c173d
......@@ -80,7 +80,7 @@ _060_real_ovfl:
fsave -(%sp)
move.w #0x6000,0x2(%sp)
frestore (%sp)+
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
......@@ -99,7 +99,7 @@ _060_real_unfl:
fsave -(%sp)
move.w #0x6000,0x2(%sp)
frestore (%sp)+
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_operr():
......@@ -118,7 +118,7 @@ _060_real_operr:
fsave -(%sp)
move.w #0x6000,0x2(%sp)
frestore (%sp)+
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_snan():
......@@ -137,7 +137,7 @@ _060_real_snan:
fsave -(%sp)
move.w #0x6000,0x2(%sp)
frestore (%sp)+
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_dz():
......@@ -156,7 +156,7 @@ _060_real_dz:
fsave -(%sp)
move.w #0x6000,0x2(%sp)
frestore (%sp)+
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_inex():
......@@ -175,7 +175,7 @@ _060_real_inex:
fsave -(%sp)
move.w #0x6000,0x2(%sp)
frestore (%sp)+
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_bsun():
......@@ -197,7 +197,7 @@ _060_real_bsun:
andi.b #0xfe,(%sp)
fmove.l (%sp)+,%fpsr
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_fline():
......@@ -211,7 +211,7 @@ _060_real_bsun:
|
.global _060_real_fline
_060_real_fline:
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_fpu_disabled():
......@@ -250,7 +250,7 @@ _060_real_fpu_disabled:
|
.global _060_real_trap
_060_real_trap:
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|############################################################################
......
arch/m68k/ifpsp060/iskeleton.S
View file @ 912c173d
......@@ -76,8 +76,8 @@ _060_isp_done:
SAVE_ALL_INT
GET_CURRENT(%d0)
tstl %curptr@(TASK_NEEDRESCHED)
jne SYMBOL_NAME(ret_from_exception) | deliver signals,
| reschedule etc..
jne ret_from_exception | deliver signals,
| reschedule etc..
RESTORE_ALL
|
......@@ -113,7 +113,7 @@ _060_real_chk:
| bral _060_real_trace
real_chk_end:
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|
| _060_real_divbyzero:
......@@ -153,7 +153,7 @@ _060_real_divbyzero:
| bral _060_real_trace
real_divbyzero_end:
bral SYMBOL_NAME(trap) | jump to trap handler
bral trap | jump to trap handler
|##########################
......
arch/m68k/ifpsp060/os.S
View file @ 912c173d
......@@ -358,7 +358,7 @@ copyinae:
|
.global _060_real_trace
_060_real_trace:
bral SYMBOL_NAME(trap)
bral trap
|
| _060_real_access():
......@@ -374,7 +374,7 @@ _060_real_trace:
|
.global _060_real_access
_060_real_access:
bral SYMBOL_NAME(buserr)
bral buserr
......
arch/m68k/kernel/entry.S
View file @ 912c173d
This diff is collapsed.
arch/m68k/kernel/head.S
View file @ 912c173d
......@@ -302,15 +302,15 @@
/* #define FONT_8x16 */ /* 2nd choice */
/* #define FONT_6x11 */ /* 3rd choice */
.globl SYMBOL_NAME(kernel_pg_dir)
.globl SYMBOL_NAME(availmem)
.globl SYMBOL_NAME(m68k_pgtable_cachemode)
.globl SYMBOL_NAME(m68k_supervisor_cachemode)
.globl kernel_pg_dir
.globl availmem
.globl m68k_pgtable_cachemode
.globl m68k_supervisor_cachemode
#ifdef CONFIG_MVME16x
.globl SYMBOL_NAME(mvme_bdid)
.globl mvme_bdid
#endif
#ifdef CONFIG_Q40
.globl SYMBOL_NAME(q40_mem_cptr)
.globl q40_mem_cptr
#endif
CPUTYPE_040 = 1 /* indicates an 040 */
......@@ -585,40 +585,40 @@ ENTRY(_stext)
.long MACH_MAC, MAC_BOOTI_VERSION
.long MACH_Q40, Q40_BOOTI_VERSION
.long 0
1: jra SYMBOL_NAME(__start)
1: jra __start
.equ SYMBOL_NAME(kernel_pg_dir),SYMBOL_NAME(_stext)
.equ kernel_pg_dir,_stext
.equ .,SYMBOL_NAME(_stext)+PAGESIZE
.equ .,_stext+PAGESIZE
ENTRY(_start)
jra SYMBOL_NAME(__start)
jra __start
__INIT
ENTRY(__start)
/*
* Setup initial stack pointer
*/
lea %pc@(SYMBOL_NAME(_stext)),%sp
lea %pc@(_stext),%sp
/*
* Record the CPU and machine type.
*/
get_bi_record BI_MACHTYPE
lea %pc@(SYMBOL_NAME(m68k_machtype)),%a1
lea %pc@(m68k_machtype),%a1
movel %a0@,%a1@
get_bi_record BI_FPUTYPE
lea %pc@(SYMBOL_NAME(m68k_fputype)),%a1
lea %pc@(m68k_fputype),%a1
movel %a0@,%a1@
get_bi_record BI_MMUTYPE
lea %pc@(SYMBOL_NAME(m68k_mmutype)),%a1
lea %pc@(m68k_mmutype),%a1
movel %a0@,%a1@
get_bi_record BI_CPUTYPE
lea %pc@(SYMBOL_NAME(m68k_cputype)),%a1
lea %pc@(m68k_cputype),%a1
movel %a0@,%a1@
#ifdef CONFIG_MAC
......@@ -682,7 +682,7 @@ L(test_notmac):
* and is converted here from a booter type definition to a separate bit
* number which allows for the standard is_0x0 macro tests.
*/
movel %pc@(SYMBOL_NAME(m68k_cputype)),%d0
movel %pc@(m68k_cputype),%d0
/*
* Assume it's an 030
*/
......@@ -766,9 +766,9 @@ L(test_notmac):
L(save_cachetype):
/* Save cache mode for supervisor mode and page tables
*/
lea %pc@(SYMBOL_NAME(m68k_supervisor_cachemode)),%a0
lea %pc@(m68k_supervisor_cachemode),%a0
movel %d0,%a0@
lea %pc@(SYMBOL_NAME(m68k_pgtable_cachemode)),%a0
lea %pc@(m68k_pgtable_cachemode),%a0
movel %d1,%a0@
/*
......@@ -804,7 +804,7 @@ L(save_cachetype):
tstl %d0
jbmi 1f
movel %a0@,%d3
lea %pc@(SYMBOL_NAME(atari_mch_type)),%a0
lea %pc@(atari_mch_type),%a0
movel %d3,%a0@
1:
/* On the Hades, the iobase must be set up before opening the
......@@ -834,7 +834,7 @@ L(getvmetype):
tstl %d0
jbmi 1f
movel %a0@,%d3
lea %pc@(SYMBOL_NAME(vme_brdtype)),%a0
lea %pc@(vme_brdtype),%a0
movel %d3,%a0@
1:
#ifdef CONFIG_MVME16x
......@@ -854,7 +854,7 @@ L(getvmetype):
.word 0x70 /* trap 0x70 - .BRD_ID */
movel %sp@+,%a0
1:
lea %pc@(SYMBOL_NAME(mvme_bdid)),%a1
lea %pc@(mvme_bdid),%a1
/* Structure is 32 bytes long */
movel %a0@+,%a1@+
movel %a0@+,%a1@+
......@@ -894,16 +894,16 @@ L(nocon):
putc '\n'
putc 'A'
dputn %pc@(L(cputype))
dputn %pc@(SYMBOL_NAME(m68k_supervisor_cachemode))
dputn %pc@(SYMBOL_NAME(m68k_pgtable_cachemode))
dputn %pc@(m68k_supervisor_cachemode)
dputn %pc@(m68k_pgtable_cachemode)
dputc '\n'
/*
* Save physical start address of kernel
*/
lea %pc@(L(phys_kernel_start)),%a0
lea %pc@(SYMBOL_NAME(_stext)),%a1
subl #SYMBOL_NAME(_stext),%a1
lea %pc@(_stext),%a1
subl #_stext,%a1
addl #PAGE_OFFSET,%a1
movel %a1,%a0@
......@@ -920,7 +920,7 @@ L(nocon):
*/
mmu_map #PAGE_OFFSET,%pc@(L(phys_kernel_start)),#4*1024*1024,\
%pc@(SYMBOL_NAME(m68k_supervisor_cachemode))
%pc@(m68k_supervisor_cachemode)
putc 'C'
......@@ -984,7 +984,7 @@ L(mmu_init_atari):
/* I/O base addr for non-Medusa, non-Hades: 0x00000000 */
moveq #0,%d0
movel %pc@(SYMBOL_NAME(atari_mch_type)),%d3
movel %pc@(atari_mch_type),%d3
cmpl #ATARI_MACH_MEDUSA,%d3
jbeq 2f
cmpl #ATARI_MACH_HADES,%d3
......@@ -1263,7 +1263,7 @@ L(mmu_fixup):
*/
movel %pc@(L(phys_kernel_start)),%d0
subl #PAGE_OFFSET,%d0
lea %pc@(SYMBOL_NAME(_stext)),%a0
lea %pc@(_stext),%a0
subl %d0,%a0
mmu_fixup_page_mmu_cache %a0
......@@ -1461,7 +1461,7 @@ L(cache_done):
/*
* Setup initial stack pointer
*/
lea SYMBOL_NAME(init_task_union),%curptr
lea init_task_union,%curptr
lea 0x2000(%curptr),%sp
putc 'K'
......@@ -1471,14 +1471,14 @@ L(cache_done):
/*
* The new 64bit printf support requires an early exception initialization.
*/
jbsr SYMBOL_NAME(base_trap_init)
jbsr base_trap_init
/* jump to the kernel start */
putc '\n'
leds 0x55
jbsr SYMBOL_NAME(start_kernel)
jbsr start_kernel
/*
* Find a tag record in the bootinfo structure
......@@ -1489,7 +1489,7 @@ L(cache_done):
func_start get_bi_record,%d1
movel ARG1,%d0
lea %pc@(SYMBOL_NAME(_end)),%a0
lea %pc@(_end),%a0
1: tstw %a0@(BIR_TAG)
jeq 3f
cmpw %a0@(BIR_TAG),%d0
......@@ -1669,7 +1669,7 @@ mmu_040_print:
jbra 1b
#endif /* MMU 040 Dumping code that's gory and detailed */
lea %pc@(SYMBOL_NAME(kernel_pg_dir)),%a5
lea %pc@(kernel_pg_dir),%a5
movel %a5,%a0 /* a0 has the address of the root table ptr */
movel #0x00000000,%a4 /* logical address */
moveql #0,%d0
......@@ -2286,7 +2286,7 @@ func_start mmu_fixup_page_mmu_cache,%d0/%a0
movel %a0@,%d0
andil #_CACHEMASK040,%d0
orl %pc@(SYMBOL_NAME(m68k_pgtable_cachemode)),%d0
orl %pc@(m68k_pgtable_cachemode),%d0
movel %d0,%a0@
dputc '\n'
......@@ -2516,7 +2516,7 @@ func_start mmu_get_root_table_entry,%d0/%a1
* in mm/init.c simply expects kernel_pg_dir there, the rest of
* page is used for further ptr tables in get_ptr_table.
*/
lea %pc@(SYMBOL_NAME(_stext)),%a0
lea %pc@(_stext),%a0
lea %pc@(L(mmu_cached_pointer_tables)),%a1
movel %a0,%a1@
addl #ROOT_TABLE_SIZE*4,%a1@
......@@ -2907,7 +2907,7 @@ L(serial_init_not_mac):
is_not_q40(2f)
/* debug output goes into SRAM, so we don't do it unless requested
- check for '%LX$' signature in SRAM */
lea %pc@(SYMBOL_NAME(q40_mem_cptr)),%a1
lea %pc@(q40_mem_cptr),%a1
move.l #0xff020010,%a1@ /* must be inited - also used by debug=mem */
move.l #0xff020000,%a1
cmp.b #'%',%a1@
......@@ -3040,7 +3040,7 @@ func_start serial_putc,%d0/%d1/%a0/%a1
* the SRAM, which is non-standard.
*/
moveml %d0-%d7/%a2-%a6,%sp@-
movel SYMBOL_NAME(vme_brdtype),%d1
movel vme_brdtype,%d1
jeq 1f | No tag - use the Bug
cmpi #VME_TYPE_MVME162,%d1
jeq 6f
......@@ -3112,7 +3112,7 @@ func_start serial_putc,%d0/%d1/%a0/%a1
is_not_q40(2f)
tst.l %pc@(L(q40_do_debug)) /* only debug if requested */
beq 2f
lea %pc@(SYMBOL_NAME(q40_mem_cptr)),%a1
lea %pc@(q40_mem_cptr),%a1
move.l %a1@,%a0
move.b %d0,%a0@
addq.l #4,%a0
......@@ -3287,13 +3287,13 @@ console_clear_loop:
/* Calculate font size */
#if defined(FONT_8x8)
lea %pc@(SYMBOL_NAME(font_vga_8x8)), %a0
lea %pc@(font_vga_8x8), %a0
#elif defined(FONT_8x16)
lea %pc@(SYMBOL_NAME(font_vga_8x16)),%a0
lea %pc@(font_vga_8x16),%a0
#elif defined(FONT_6x11)
lea %pc@(SYMBOL_NAME(font_vga_6x11)),%a0
lea %pc@(font_vga_6x11),%a0
#else /* (FONT_8x8) default */
lea %pc@(SYMBOL_NAME(font_vga_8x8)), %a0
lea %pc@(font_vga_8x8), %a0
#endif
/*
......@@ -3347,11 +3347,11 @@ L(console_put_stats):
putn %pc@(L(mac_videobase)) /* video addr. */
puts "\n _stext:"
lea %pc@(SYMBOL_NAME(_stext)),%a0
lea %pc@(_stext),%a0
putn %a0
puts "\nbootinfo:"
lea %pc@(SYMBOL_NAME(_end)),%a0
lea %pc@(_end),%a0
putn %a0
puts "\ncpuid:"
......@@ -3380,7 +3380,7 @@ L(console_put_penguin):
subil #64,%d0 /* snug up against the right edge */
clrl %d1 /* start at the top */
movel #73,%d7
lea %pc@(SYMBOL_NAME(that_penguin)),%a1
lea %pc@(that_penguin),%a1
console_penguin_row:
movel #31,%d6
console_penguin_pixel_pair:
......@@ -3846,18 +3846,18 @@ __FINIT
.data
.align 4
SYMBOL_NAME_LABEL(availmem)
availmem:
.long 0
SYMBOL_NAME_LABEL(m68k_pgtable_cachemode)
m68k_pgtable_cachemode:
.long 0
SYMBOL_NAME_LABEL(m68k_supervisor_cachemode)
m68k_supervisor_cachemode:
.long 0
#if defined(CONFIG_MVME16x)
SYMBOL_NAME_LABEL(mvme_bdid)
mvme_bdid:
.long 0,0,0,0,0,0,0,0
#endif
#if defined(CONFIG_Q40)
SYMBOL_NAME_LABEL(q40_mem_cptr)
q40_mem_cptr:
.long 0
L(q40_do_debug):
.long 0
......
arch/m68k/kernel/signal.c
View file @ 912c173d
......@@ -408,7 +408,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *usc, void *fp,
"2: movesl %4@+,%2\n\t"
"3: movel %2,%/a0@+\n\t"
" dbra %1,2b\n\t"
" bral " SYMBOL_NAME_STR(ret_from_signal) "\n"
" bral ret_from_signal\n"
"4:\n"
".section __ex_table,\"a\"\n"
" .align 4\n"
......@@ -507,7 +507,7 @@ rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw,
"2: movesl %4@+,%2\n\t"
"3: movel %2,%/a0@+\n\t"
" dbra %1,2b\n\t"
" bral " SYMBOL_NAME_STR(ret_from_signal) "\n"
" bral ret_from_signal\n"
"4:\n"
".section __ex_table,\"a\"\n"
" .align 4\n"
......
arch/m68k/kernel/sun3-head.S
View file @ 912c173d
......@@ -12,27 +12,27 @@ CACHES_OFF = 0x00000008 | actually a clear and disable --m
ROOT_TABLE_SIZE = 128
PAGESIZE = 8192
SUN3_INVALID_PMEG = 255
.globl SYMBOL_NAME(bootup_user_stack)
.globl SYMBOL_NAME(bootup_kernel_stack)
.globl SYMBOL_NAME(pg0)
.globl SYMBOL_NAME(empty_bad_page)
.globl SYMBOL_NAME(empty_bad_page_table)
.globl SYMBOL_NAME(empty_zero_page)
.globl SYMBOL_NAME(swapper_pg_dir)
.globl SYMBOL_NAME(kernel_pmd_table)
.globl SYMBOL_NAME(availmem)
.global SYMBOL_NAME(m68k_pgtable_cachemode)
.global SYMBOL_NAME(kpt)
.globl bootup_user_stack
.globl bootup_kernel_stack
.globl pg0
.globl empty_bad_page
.globl empty_bad_page_table
.globl empty_zero_page
.globl swapper_pg_dir
.globl kernel_pmd_table
.globl availmem
.global m68k_pgtable_cachemode
.global kpt
| todo: all these should be in bss!
SYMBOL_NAME(swapper_pg_dir): .skip 0x2000
SYMBOL_NAME(pg0): .skip 0x2000
SYMBOL_NAME(empty_bad_page): .skip 0x2000
SYMBOL_NAME(empty_bad_page_table): .skip 0x2000
SYMBOL_NAME(kernel_pmd_table): .skip 0x2000
SYMBOL_NAME(empty_zero_page): .skip 0x2000
swapper_pg_dir: .skip 0x2000
pg0: .skip 0x2000
empty_bad_page: .skip 0x2000
empty_bad_page_table: .skip 0x2000
kernel_pmd_table: .skip 0x2000
empty_zero_page: .skip 0x2000
.globl SYMBOL_NAME(kernel_pg_dir)
.equ SYMBOL_NAME(kernel_pg_dir),SYMBOL_NAME(kernel_pmd_table)
.globl kernel_pg_dir
.equ kernel_pg_dir,kernel_pmd_table
.section .head
ENTRY(_stext)
......@@ -69,11 +69,11 @@ ENTRY(_start)
jmp 1f:l
/* Following code executes at high addresses (0xE000xxx). */
1: lea SYMBOL_NAME(init_task_union),%a2 | get initial thread...
1: lea init_task_union,%a2 | get initial thread...
lea %a2@(KTHREAD_SIZE),%sp | ...and its stack.
/* copy bootinfo records from the loader to _end */
lea SYMBOL_NAME(_end), %a1
lea _end, %a1
lea BI_START, %a0
/* number of longs to copy */
movel %a0@, %d0
......@@ -88,22 +88,22 @@ ENTRY(_start)
moveq #-1,%d0
movsb %d0,(AC_SEGMAP+0x0)
jbsr SYMBOL_NAME(sun3_init)
jbsr sun3_init
jbsr SYMBOL_NAME(base_trap_init)
jbsr base_trap_init
jbsr SYMBOL_NAME(start_kernel)
jbsr start_kernel
trap #15
.data
.even
SYMBOL_NAME_LABEL(kpt)
kpt:
.long 0
SYMBOL_NAME_LABEL(availmem)
availmem:
.long 0
| todo: remove next two. --m
SYMBOL_NAME_LABEL(is_medusa)
is_medusa:
.long 0
SYMBOL_NAME_LABEL(m68k_pgtable_cachemode)
m68k_pgtable_cachemode:
.long 0
arch/m68k/kernel/traps.c
View file @ 912c173d
......@@ -64,7 +64,7 @@ e_vector vectors[256] = {
/* nmi handler for the Amiga */
asm(".text\n"
__ALIGN_STR "\n"
SYMBOL_NAME_STR(nmihandler) ": rte");
"nmihandler: rte");
/*
* this must be called very early as the kernel might
......
arch/m68k/lib/semaphore.S
View file @ 912c173d
......@@ -18,7 +18,7 @@
ENTRY(__down_failed)
moveml %a0/%d0/%d1,-(%sp)
movel %a1,-(%sp)
jbsr SYMBOL_NAME(__down)
jbsr __down
movel (%sp)+,%a1
moveml (%sp)+,%a0/%d0/%d1
rts
......@@ -27,7 +27,7 @@ ENTRY(__down_failed_interruptible)
movel %a0,-(%sp)
movel %d1,-(%sp)
movel %a1,-(%sp)
jbsr SYMBOL_NAME(__down_interruptible)
jbsr __down_interruptible
movel (%sp)+,%a1
movel (%sp)+,%d1
movel (%sp)+,%a0
......@@ -37,7 +37,7 @@ ENTRY(__down_failed_trylock)
movel %a0,-(%sp)
movel %d1,-(%sp)
movel %a1,-(%sp)
jbsr SYMBOL_NAME(__down_trylock)
jbsr __down_trylock
movel (%sp)+,%a1
movel (%sp)+,%d1
movel (%sp)+,%a0
......@@ -46,7 +46,7 @@ ENTRY(__down_failed_trylock)
ENTRY(__up_wakeup)
moveml %a0/%d0/%d1,-(%sp)
movel %a1,-(%sp)
jbsr SYMBOL_NAME(__up)
jbsr __up
movel (%sp)+,%a1
moveml (%sp)+,%a0/%d0/%d1
rts
......
arch/m68k/math-emu/fp_entry.S
View file @ 912c173d
......@@ -41,17 +41,17 @@
#include "fp_emu.h"
.globl SYMBOL_NAME(fpu_emu)
.globl fpu_emu
.globl fp_debugprint
.globl fp_err_ua1,fp_err_ua2
.text
SYMBOL_NAME_LABEL(fpu_emu)
fpu_emu:
SAVE_ALL_INT
GET_CURRENT(%d0)
#if defined(CPU_M68020_OR_M68030) && defined(CPU_M68040_OR_M68060)
tst.l SYMBOL_NAME(m68k_is040or060)
tst.l m68k_is040or060
jeq 1f
#endif
#if defined(CPU_M68040_OR_M68060)
......@@ -63,7 +63,7 @@ SYMBOL_NAME_LABEL(fpu_emu)
#if defined(CONFIG_M68060)
#if !defined(CPU_M68060_ONLY)
btst #3,SYMBOL_NAME(m68k_cputype)+3
btst #3,m68k_cputype+3
jeq 1f
#endif
btst #7,(FPS_SR,%sp)
......@@ -72,11 +72,11 @@ SYMBOL_NAME_LABEL(fpu_emu)
1:
| emulation successful?
tst.l %d0
jeq SYMBOL_NAME(ret_from_exception)
jeq ret_from_exception
| send some signal to program here
jra SYMBOL_NAME(ret_from_exception)
jra ret_from_exception
| we jump here after an access error while trying to access
| user space, we correct stackpointer and send a SIGSEGV to
......@@ -88,9 +88,9 @@ fp_err_ua1:
move.l %a0,-(%sp)
pea SEGV_MAPERR
pea SIGSEGV
jsr SYMBOL_NAME(fpemu_signal)
jsr fpemu_signal
add.w #12,%sp
jra SYMBOL_NAME(ret_from_exception)
jra ret_from_exception
#if defined(CONFIG_M68060)
| send a trace signal if we are debugged
......@@ -99,9 +99,9 @@ fp_sendtrace060:
move.l (FPS_PC,%sp),-(%sp)
pea TRAP_TRACE
pea SIGTRAP
jsr SYMBOL_NAME(fpemu_signal)
jsr fpemu_signal
add.w #12,%sp
jra SYMBOL_NAME(ret_from_exception)
jra ret_from_exception
#endif
.globl fp_get_data_reg, fp_put_data_reg
......
include/asm-m68k/system.h
View file @ 912c173d
......@@ -40,7 +40,7 @@ asmlinkage void resume(void);
register void *_prev __asm__ ("a0") = (prev); \
register void *_next __asm__ ("a1") = (next); \
register void *_last __asm__ ("d1"); \
__asm__ __volatile__("jbsr " SYMBOL_NAME_STR(resume) \
__asm__ __volatile__("jbsr resume" \
: "=d" (_last) : "a" (_prev), "a" (_next) \
: "d0", /* "d1", */ "d2", "d3", "d4", "d5", "a0", "a1"); \
(last) = _last; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7