Skip to content

L
linux
Commit 7c7e5a98 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files
Options

[PATCH] M68k head console 

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Use function macros and local macro for console functions (from Roman
Zippel)
parent 03490660
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 101 deletions
arch/m68k/kernel/head.S
View file @ 7c7e5a98
...@@ -483,6 +483,12 @@ func_define set_leds ...@@ -483,6 +483,12 @@ func_define set_leds
func_define serial_putc,1 func_define serial_putc,1
func_define console_putc,1 func_define console_putc,1
func_define console_init
func_define console_put_stats
func_define console_put_penguin
func_define console_plot_pixel,3
func_define console_scroll
.macro putc ch .macro putc ch
#if defined(CONSOLE) || defined(SERIAL_DEBUG) #if defined(CONSOLE) || defined(SERIAL_DEBUG)
pea \ch pea \ch
...@@ -960,11 +966,11 @@ L(gvtdone): ...@@ -960,11 +966,11 @@ L(gvtdone):
#ifdef CONFIG_MAC #ifdef CONFIG_MAC
is_not_mac(L(nocon)) is_not_mac(L(nocon))
#ifdef CONSOLE #ifdef CONSOLE
jbsr L(console_init) console_init
#ifdef CONSOLE_PENGUIN #ifdef CONSOLE_PENGUIN
jbsr L(console_put_penguin) console_put_penguin
#endif /* CONSOLE_PENGUIN */ #endif /* CONSOLE_PENGUIN */
jbsr L(console_put_stats) console_put_stats
#endif /* CONSOLE */ #endif /* CONSOLE */
L(nocon): L(nocon):
#endif /* CONFIG_MAC */ #endif /* CONFIG_MAC */
...@@ -3313,7 +3319,7 @@ func_return set_leds ...@@ -3313,7 +3319,7 @@ func_return set_leds
#define Lconsole_struct_left_edge 16 #define Lconsole_struct_left_edge 16
#define Lconsole_struct_penguin_putc 20 #define Lconsole_struct_penguin_putc 20
L(console_init): func_start console_init,%a0-%a4/%d0-%d7
/* /*
* Some of the register usage that follows * Some of the register usage that follows
* a0 = pointer to boot_info * a0 = pointer to boot_info
...@@ -3327,7 +3333,6 @@ L(console_init): ...@@ -3327,7 +3333,6 @@ L(console_init):
* d5 = number of bytes per scan line * d5 = number of bytes per scan line
* d6 = number of bytes on the entire screen * d6 = number of bytes on the entire screen
*/ */
moveml %a0-%a4/%d0-%d7,%sp@-
lea %pc@(L(console_globals)),%a2 lea %pc@(L(console_globals)),%a2
lea %pc@(L(mac_videobase)),%a0 lea %pc@(L(mac_videobase)),%a0
...@@ -3347,10 +3352,10 @@ L(console_init): ...@@ -3347,10 +3352,10 @@ L(console_init):
divul #8,%d6 /* we'll clear 8 bytes at a time */ divul #8,%d6 /* we'll clear 8 bytes at a time */
subq #1,%d6 subq #1,%d6
console_clear_loop: L(console_clear_loop):
movel #0xffffffff,%a1@+ /* Mac_black */ movel #0xffffffff,%a1@+ /* Mac_black */
movel #0xffffffff,%a1@+ /* Mac_black */ movel #0xffffffff,%a1@+ /* Mac_black */
dbra %d6,console_clear_loop dbra %d6,L(console_clear_loop)
/* Calculate font size */ /* Calculate font size */
...@@ -3401,17 +3406,15 @@ console_clear_loop: ...@@ -3401,17 +3406,15 @@ console_clear_loop:
/* /*
* Initialization is complete * Initialization is complete
*/ */
1: moveml %sp@+,%a0-%a4/%d0-%d7 1:
rts func_return console_init
L(console_put_stats): func_start console_put_stats,%a0/%d7
/* /*
* Some of the register usage that follows * Some of the register usage that follows
* a0 = pointer to boot_info * a0 = pointer to boot_info
* d7 = value of boot_info fields * d7 = value of boot_info fields
*/ */
moveml %a0/%d7,%sp@-
puts "\nMacLinux\n\n" puts "\nMacLinux\n\n"
#ifdef SERIAL_DEBUG #ifdef SERIAL_DEBUG
...@@ -3439,17 +3442,14 @@ L(console_put_stats): ...@@ -3439,17 +3442,14 @@ L(console_put_stats):
# endif /* MMU_PRINT */ # endif /* MMU_PRINT */
#endif /* SERIAL_DEBUG */ #endif /* SERIAL_DEBUG */
moveml %sp@+,%a0/%d7 func_return console_put_stats
rts
#ifdef CONSOLE_PENGUIN #ifdef CONSOLE_PENGUIN
L(console_put_penguin): func_start console_put_penguin,%a0-%a1/%d0-%d7
/* /*
* Get 'that_penguin' onto the screen in the upper right corner * Get 'that_penguin' onto the screen in the upper right corner
* penguin is 64 x 74 pixels, align against right edge of screen * penguin is 64 x 74 pixels, align against right edge of screen
*/ */
moveml %a0-%a1/%d0-%d7,%sp@-
lea %pc@(L(mac_dimensions)),%a0 lea %pc@(L(mac_dimensions)),%a0
movel %a0@,%d0 movel %a0@,%d0
andil #0xffff,%d0 andil #0xffff,%d0
...@@ -3457,34 +3457,32 @@ L(console_put_penguin): ...@@ -3457,34 +3457,32 @@ L(console_put_penguin):
clrl %d1 /* start at the top */ clrl %d1 /* start at the top */
movel #73,%d7 movel #73,%d7
lea %pc@(that_penguin),%a1 lea %pc@(that_penguin),%a1
console_penguin_row: L(console_penguin_row):
movel #31,%d6 movel #31,%d6
console_penguin_pixel_pair: L(console_penguin_pixel_pair):
moveb %a1@,%d2 moveb %a1@,%d2
lsrb #4,%d2 lsrb #4,%d2
jbsr console_plot_pixel console_plot_pixel %d0,%d1,%d2
addq #1,%d0 addq #1,%d0
moveb %a1@+,%d2 moveb %a1@+,%d2
jbsr console_plot_pixel console_plot_pixel %d0,%d1,%d2
addq #1,%d0 addq #1,%d0
dbra %d6,console_penguin_pixel_pair dbra %d6,L(console_penguin_pixel_pair)
subil #64,%d0 subil #64,%d0
addq #1,%d1 addq #1,%d1
dbra %d7,console_penguin_row dbra %d7,L(console_penguin_row)
moveml %sp@+,%a0-%a1/%d0-%d7 func_return console_put_penguin
rts
#endif #endif
console_scroll:
moveml %a0-%a4/%d0-%d7,%sp@-
/* /*
* Calculate source and destination addresses * Calculate source and destination addresses
* output a1 = dest * output a1 = dest
* a2 = source * a2 = source
*/ */
func_start console_scroll,%a0-%a4/%d0-%d7
lea %pc@(L(mac_videobase)),%a0 lea %pc@(L(mac_videobase)),%a0
movel %a0@,%a1 movel %a0@,%a1
movel %a1,%a2 movel %a1,%a2
...@@ -3517,7 +3515,7 @@ console_scroll: ...@@ -3517,7 +3515,7 @@ console_scroll:
divul #32,%d6 /* we'll move 8 longs at a time */ divul #32,%d6 /* we'll move 8 longs at a time */
subq #1,%d6 subq #1,%d6
console_scroll_loop: L(console_scroll_loop):
movel %a2@+,%a1@+ movel %a2@+,%a1@+
movel %a2@+,%a1@+ movel %a2@+,%a1@+
movel %a2@+,%a1@+ movel %a2@+,%a1@+
...@@ -3526,7 +3524,7 @@ console_scroll_loop: ...@@ -3526,7 +3524,7 @@ console_scroll_loop:
movel %a2@+,%a1@+ movel %a2@+,%a1@+
movel %a2@+,%a1@+ movel %a2@+,%a1@+
movel %a2@+,%a1@+ movel %a2@+,%a1@+
dbra %d6,console_scroll_loop dbra %d6,L(console_scroll_loop)
lea %pc@(L(mac_rowbytes)),%a0 lea %pc@(L(mac_rowbytes)),%a0
movel %a0@,%d6 movel %a0@,%d6
...@@ -3536,7 +3534,7 @@ console_scroll_loop: ...@@ -3536,7 +3534,7 @@ console_scroll_loop:
subq #1,%d6 subq #1,%d6
moveq #-1,%d0 moveq #-1,%d0
console_scroll_clear_loop: L(console_scroll_clear_loop):
movel %d0,%a1@+ movel %d0,%a1@+
movel %d0,%a1@+ movel %d0,%a1@+
movel %d0,%a1@+ movel %d0,%a1@+
...@@ -3545,17 +3543,17 @@ console_scroll_clear_loop: ...@@ -3545,17 +3543,17 @@ console_scroll_clear_loop:
movel %d0,%a1@+ movel %d0,%a1@+
movel %d0,%a1@+ movel %d0,%a1@+
movel %d0,%a1@+ movel %d0,%a1@+
dbra %d6,console_scroll_clear_loop dbra %d6,L(console_scroll_clear_loop)
1: moveml %sp@+,%a0-%a4/%d0-%d7 1:
rts func_return console_scroll
func_start console_putc,%a0/%a1/%d0-%d7 func_start console_putc,%a0/%a1/%d0-%d7
is_not_mac(console_exit) is_not_mac(L(console_exit))
tstl %pc@(L(console_font)) tstl %pc@(L(console_font))
jeq console_exit jeq L(console_exit)
/* Output character in d7 on console. /* Output character in d7 on console.
*/ */
...@@ -3569,7 +3567,7 @@ func_start console_putc,%a0/%a1/%d0-%d7 ...@@ -3569,7 +3567,7 @@ func_start console_putc,%a0/%a1/%d0-%d7
lea %pc@(L(console_globals)),%a0 lea %pc@(L(console_globals)),%a0
cmpib #10,%d7 cmpib #10,%d7
jne console_not_lf jne L(console_not_lf)
movel %a0@(Lconsole_struct_cur_row),%d0 movel %a0@(Lconsole_struct_cur_row),%d0
addil #1,%d0 addil #1,%d0
movel %d0,%a0@(Lconsole_struct_cur_row) movel %d0,%a0@(Lconsole_struct_cur_row)
...@@ -3578,22 +3576,22 @@ func_start console_putc,%a0/%a1/%d0-%d7 ...@@ -3578,22 +3576,22 @@ func_start console_putc,%a0/%a1/%d0-%d7
jcs 1f jcs 1f
subil #1,%d0 subil #1,%d0
movel %d0,%a0@(Lconsole_struct_cur_row) movel %d0,%a0@(Lconsole_struct_cur_row)
jbsr console_scroll console_scroll
1: 1:
jra console_exit jra L(console_exit)
console_not_lf: L(console_not_lf):
cmpib #13,%d7 cmpib #13,%d7
jne console_not_cr jne L(console_not_cr)
clrl %a0@(Lconsole_struct_cur_column) clrl %a0@(Lconsole_struct_cur_column)
jra console_exit jra L(console_exit)
console_not_cr: L(console_not_cr):
cmpib #1,%d7 cmpib #1,%d7
jne console_not_home jne L(console_not_home)
clrl %a0@(Lconsole_struct_cur_row) clrl %a0@(Lconsole_struct_cur_row)
clrl %a0@(Lconsole_struct_cur_column) clrl %a0@(Lconsole_struct_cur_column)
jra console_exit jra L(console_exit)
/* /*
* At this point we know that the %d7 character is going to be * At this point we know that the %d7 character is going to be
...@@ -3604,7 +3602,7 @@ console_not_cr: ...@@ -3604,7 +3602,7 @@ console_not_cr:
* d1 = cursor row to draw the character * d1 = cursor row to draw the character
* d7 = character number * d7 = character number
*/ */
console_not_home: L(console_not_home):
movel %a0@(Lconsole_struct_cur_column),%d0 movel %a0@(Lconsole_struct_cur_column),%d0
addil #1,%a0@(Lconsole_struct_cur_column) addil #1,%a0@(Lconsole_struct_cur_column)
movel %a0@(Lconsole_struct_num_columns),%d1 movel %a0@(Lconsole_struct_num_columns),%d1
...@@ -3616,10 +3614,10 @@ console_not_home: ...@@ -3616,10 +3614,10 @@ console_not_home:
/* /*
* At this point we make a shift in register usage * At this point we make a shift in register usage
* a0 = address of pointer to font data (font_desc) * a0 = address of pointer to font data (fbcon_font_desc)
*/ */
movel %pc@(L(console_font)),%a0 movel %pc@(L(console_font)),%a0
movel %a0@(FONT_DESC_DATA),%a1 /* Load font_desc.data into a1 */ movel %a0@(FONT_DESC_DATA),%a1 /* Load fbcon_font_desc.data into a1 */
andl #0x000000ff,%d7 andl #0x000000ff,%d7
/* ASSERT: a0 = contents of Lconsole_font */ /* ASSERT: a0 = contents of Lconsole_font */
mulul %a0@(FONT_DESC_HEIGHT),%d7 /* d7 = index into font data */ mulul %a0@(FONT_DESC_HEIGHT),%d7 /* d7 = index into font data */
...@@ -3637,32 +3635,30 @@ console_not_home: ...@@ -3637,32 +3635,30 @@ console_not_home:
/* ASSERT: a0 = contents of Lconsole_font */ /* ASSERT: a0 = contents of Lconsole_font */
mulul %a0@(FONT_DESC_WIDTH),%d0 mulul %a0@(FONT_DESC_WIDTH),%d0
mulul %a0@(FONT_DESC_HEIGHT),%d1 mulul %a0@(FONT_DESC_HEIGHT),%d1
movel %a0@(FONT_DESC_HEIGHT),%d7 /* Load font_desc.height into d7 */ movel %a0@(FONT_DESC_HEIGHT),%d7 /* Load fbcon_font_desc.height into d7 */
subq #1,%d7 subq #1,%d7
console_read_char_scanline: L(console_read_char_scanline):
moveb %a1@+,%d3 moveb %a1@+,%d3
/* ASSERT: a0 = contents of Lconsole_font */ /* ASSERT: a0 = contents of Lconsole_font */
movel %a0@(FONT_DESC_WIDTH),%d6 /* Load font_desc.width into d6 */ movel %a0@(FONT_DESC_WIDTH),%d6 /* Load fbcon_font_desc.width into d6 */
subql #1,%d6 subql #1,%d6
console_do_font_scanline: L(console_do_font_scanline):
lslb #1,%d3 lslb #1,%d3
scsb %d2 /* convert 1 bit into a byte */ scsb %d2 /* convert 1 bit into a byte */
jbsr console_plot_pixel console_plot_pixel %d0,%d1,%d2
addq #1,%d0 addq #1,%d0
dbra %d6,console_do_font_scanline dbra %d6,L(console_do_font_scanline)
/* ASSERT: a0 = contents of Lconsole_font */ /* ASSERT: a0 = contents of Lconsole_font */
subl %a0@(FONT_DESC_WIDTH),%d0 subl %a0@(FONT_DESC_WIDTH),%d0
addq #1,%d1 addq #1,%d1
dbra %d7,console_read_char_scanline dbra %d7,L(console_read_char_scanline)
console_exit:
L(console_exit):
func_return console_putc func_return console_putc
console_plot_pixel:
/* /*
* Input: * Input:
* d0 = x coordinate * d0 = x coordinate
...@@ -3670,14 +3666,14 @@ console_plot_pixel: ...@@ -3670,14 +3666,14 @@ console_plot_pixel:
* d2 = (bit 0) 1/0 for white/black (!) * d2 = (bit 0) 1/0 for white/black (!)
* All registers are preserved * All registers are preserved
*/ */
moveml %a0-%a1/%d0-%d4,%sp@- func_start console_plot_pixel,%a0-%a1/%d0-%d4
lea %pc@(L(mac_videobase)),%a0 movel %pc@(L(mac_videobase)),%a1
movel %a0@,%a1 movel %pc@(L(mac_videodepth)),%d3
lea %pc@(L(mac_videodepth)),%a0 movel ARG1,%d0
movel %a0@,%d3 movel ARG2,%d1
lea %pc@(L(mac_rowbytes)),%a0 mulul %pc@(L(mac_rowbytes)),%d1
mulul %a0@,%d1 movel ARG3,%d2
/* /*
* Register usage: * Register usage:
...@@ -3686,13 +3682,10 @@ console_plot_pixel: ...@@ -3686,13 +3682,10 @@ console_plot_pixel:
* d2 = black or white (0/1) * d2 = black or white (0/1)
* d3 = video depth * d3 = video depth
* d4 = temp of x (d0) for many bit depths * d4 = temp of x (d0) for many bit depths
* d5 = unused
* d6 = unused
* d7 = unused
*/ */
test_1bit: L(test_1bit):
cmpb #1,%d3 cmpb #1,%d3
jbne test_2bit jbne L(test_2bit)
movel %d0,%d4 /* we need the low order 3 bits! */ movel %d0,%d4 /* we need the low order 3 bits! */
divul #8,%d0 divul #8,%d0
addal %d0,%a1 addal %d0,%a1
...@@ -3700,16 +3693,16 @@ test_1bit: ...@@ -3700,16 +3693,16 @@ test_1bit:
andb #7,%d4 andb #7,%d4
eorb #7,%d4 /* reverse the x-coordinate w/ screen-bit # */ eorb #7,%d4 /* reverse the x-coordinate w/ screen-bit # */
andb #1,%d2 andb #1,%d2
jbne white_1 jbne L(white_1)
bsetb %d4,%a1@ bsetb %d4,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
white_1: L(white_1):
bclrb %d4,%a1@ bclrb %d4,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
test_2bit: L(test_2bit):
cmpb #2,%d3 cmpb #2,%d3
jbne test_4bit jbne L(test_4bit)
movel %d0,%d4 /* we need the low order 2 bits! */ movel %d0,%d4 /* we need the low order 2 bits! */
divul #4,%d0 divul #4,%d0
addal %d0,%a1 addal %d0,%a1
...@@ -3718,20 +3711,20 @@ test_2bit: ...@@ -3718,20 +3711,20 @@ test_2bit:
eorb #3,%d4 /* reverse the x-coordinate w/ screen-bit # */ eorb #3,%d4 /* reverse the x-coordinate w/ screen-bit # */
lsll #1,%d4 /* ! */ lsll #1,%d4 /* ! */
andb #1,%d2 andb #1,%d2
jbne white_2 jbne L(white_2)
bsetb %d4,%a1@ bsetb %d4,%a1@
addq #1,%d4 addq #1,%d4
bsetb %d4,%a1@ bsetb %d4,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
white_2: L(white_2):
bclrb %d4,%a1@ bclrb %d4,%a1@
addq #1,%d4 addq #1,%d4
bclrb %d4,%a1@ bclrb %d4,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
test_4bit: L(test_4bit):
cmpb #4,%d3 cmpb #4,%d3
jbne test_8bit jbne L(test_8bit)
movel %d0,%d4 /* we need the low order bit! */ movel %d0,%d4 /* we need the low order bit! */
divul #2,%d0 divul #2,%d0
addal %d0,%a1 addal %d0,%a1
...@@ -3740,7 +3733,7 @@ test_4bit: ...@@ -3740,7 +3733,7 @@ test_4bit:
eorb #1,%d4 eorb #1,%d4
lsll #2,%d4 /* ! */ lsll #2,%d4 /* ! */
andb #1,%d2 andb #1,%d2
jbne white_4 jbne L(white_4)
bsetb %d4,%a1@ bsetb %d4,%a1@
addq #1,%d4 addq #1,%d4
bsetb %d4,%a1@ bsetb %d4,%a1@
...@@ -3748,8 +3741,8 @@ test_4bit: ...@@ -3748,8 +3741,8 @@ test_4bit:
bsetb %d4,%a1@ bsetb %d4,%a1@
addq #1,%d4 addq #1,%d4
bsetb %d4,%a1@ bsetb %d4,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
white_4: L(white_4):
bclrb %d4,%a1@ bclrb %d4,%a1@
addq #1,%d4 addq #1,%d4
bclrb %d4,%a1@ bclrb %d4,%a1@
...@@ -3757,38 +3750,37 @@ white_4: ...@@ -3757,38 +3750,37 @@ white_4:
bclrb %d4,%a1@ bclrb %d4,%a1@
addq #1,%d4 addq #1,%d4
bclrb %d4,%a1@ bclrb %d4,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
test_8bit: L(test_8bit):
cmpb #8,%d3 cmpb #8,%d3
jbne test_16bit jbne L(test_16bit)
addal %d0,%a1 addal %d0,%a1
addal %d1,%a1 addal %d1,%a1
andb #1,%d2 andb #1,%d2
jbne white_8 jbne L(white_8)
moveb #0xff,%a1@ moveb #0xff,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
white_8: L(white_8):
clrb %a1@ clrb %a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
test_16bit: L(test_16bit):
cmpb #16,%d3 cmpb #16,%d3
jbne console_plot_pixel_exit jbne L(console_plot_pixel_exit)
addal %d0,%a1 addal %d0,%a1
addal %d0,%a1 addal %d0,%a1
addal %d1,%a1 addal %d1,%a1
andb #1,%d2 andb #1,%d2
jbne white_16 jbne L(white_16)
clrw %a1@ clrw %a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
white_16: L(white_16):
movew #0x0fff,%a1@ movew #0x0fff,%a1@
jbra console_plot_pixel_exit jbra L(console_plot_pixel_exit)
console_plot_pixel_exit: L(console_plot_pixel_exit):
moveml %sp@+,%a0-%a1/%d0-%d4 func_return console_plot_pixel
rts
#endif /* CONSOLE */ #endif /* CONSOLE */
#if 0 #if 0
......
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