Resent-Date: Sat, 9 Jan 1999 03:04:39 +0100 (MET) Sender: schmitz@lbl.gov Date: Fri, 08 Jan 1999 18:04:38 -0800 From: Michael Schmitz Organization: Tinoco Lab, UC Berkekely / Lawrence Berkeley Laboratory To: Roman Zippel CC: linux-m68k@lists.linux-m68k.org Subject: Re: experimental patches 2.1.131 References: Resent-From: linux-m68k@phil.uni-sb.de This is a multi-part message in MIME format. --------------BDCF98768F93BC16BD046215 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Roman Zippel wrote: > > Did you get the last of my diffs (the jne/jeq stuff) ? Not sure I ever sent > > it out .... > > Hmm, I think I didn't got them, anyway I'm going to test that code over > the weekend, so that I'm sure that the mapping code does what I want, at > least until turning on the mmu. Ok, found them. That'll help compiling with Mac support ... Michael --------------BDCF98768F93BC16BD046215 Content-Type: application/octet-stream; name="rz-head.S-3" Content-Transfer-Encoding: x-uuencode Content-Disposition: attachment; filename="rz-head.S-3" --- linux-2.1.131/arch/m68k/kernel/head.S.org.rz Wed Dec 30 09:07:49 1998 +++ linux-2.1.131/arch/m68k/kernel/head.S Fri Jan 1 17:59:22 1999 @@ -285,7 +285,7 @@ * Macintosh serial debug port selection; define one or both; * requires MAC_SERIAL_DEBUG to be defined */ -#undef MAC_USE_SCC_A /* Macintosh modem serial port */ +#define MAC_USE_SCC_A /* Macintosh modem serial port */ #define MAC_USE_SCC_B /* Macintosh printer serial port */ #endif /* CONFIG_MAC */ @@ -293,7 +293,7 @@ #undef MMU_PRINT #undef MMU_NOCACHE_KERNEL #define SERIAL_DEBUG -#define DEBUG +#undef DEBUG #undef MMU_PRINT_PAGE_USAGE /* @@ -305,7 +305,6 @@ /* #define FONT_6x11 /* 3rd choice */ .globl SYMBOL_NAME(kernel_pg_dir) -.globl SYMBOL_NAME(kpt) .globl SYMBOL_NAME(availmem) .globl SYMBOL_NAME(m68k_pgtable_cachemode) .globl SYMBOL_NAME(m68k_supervisor_cachemode) @@ -316,6 +315,17 @@ .globl SYMBOL_NAME(atari_mch_type) #endif +#if defined(CONFIG_MAC) +.globl SYMBOL_NAME(mac_booter_data) +.globl SYMBOL_NAME(compat_bi) +.globl SYMBOL_NAME(mac_videobase) +.globl SYMBOL_NAME(mac_videodepth) +.globl SYMBOL_NAME(mac_rowbytes) +#ifdef MAC_SERIAL_DEBUG +.globl SYMBOL_NAME(mac_sccbase) +#endif /* MAC_SERIAL_DEBUG */ +#endif + D6B_0460 = 16 /* indicates 680[46]0 in d6 */ D6B_060 = 17 /* indicates 68060 in d6 */ D6F_040 = 1<") + puts "->" movel %d1,%d7 jbsr .Lserial_putnum @@ -1815,23 +1844,23 @@ rts mmu_print_machine_cpu_types: - puts("machine: ") + puts "machine: " is_not_amiga(1f) - puts("amiga") + puts "amiga" jbra 9f 1: is_not_atari(2f) - puts("atari") + puts "atari" jbra 9f 2: is_not_mac(3f) - puts("macintosh") + puts "macintosh" jbra 9f -3: puts("unknown") -9: putr() +3: puts "unknown" +9: putr - puts("cputype: 0") + puts "cputype: 0" is_not_060(1f) putc('6') jbra 9f @@ -1841,7 +1870,7 @@ jbra 9f 2: putc('3') 9: putc('0') - putr() + putr rts #endif /* MMU_PRINT */ @@ -2322,7 +2351,9 @@ subl %d2,%sp subl %d2,ARG0 subl %d2,.Lmemory_start +#if defined(CONFIG_AMIGA) || defined(CONFIG_HP300) clrl .Lcustom +#endif func_return mmu_engage @@ -2552,8 +2583,8 @@ #if defined(CONFIG_ATARI) /* #define USE_PRINTER */ /* #define USE_SCC_B */ -/* #define USE_SCC_A */ -#define USE_MFP +#define USE_SCC_A +/* #define USE_MFP */ #if defined(USE_SCC_A) || defined(USE_SCC_B) #define USE_SCC @@ -2596,22 +2627,6 @@ LSCC_CTRL = 0xff8c81 LSCC_DATA = 0xff8c83 -/* Initialisation table for SCC */ -.Lscc_initable: - .byte 9,12 /* Reset */ - .byte 4,0x44 /* x16, 1 stopbit, no parity */ - .byte 3,0xc0 /* receiver: 8 bpc */ - .byte 5,0xe2 /* transmitter: 8 bpc, assert dtr/rts */ - .byte 9,0 /* no interrupts */ - .byte 10,0 /* NRZ */ - .byte 11,0x50 /* use baud rate generator */ - .byte 12,24,13,0 /* 9600 baud */ - .byte 14,2,14,3 /* use master clock for BRG, enable */ - .byte 3,0xc1 /* enable receiver */ - .byte 5,0xea /* enable transmitter */ - .byte -1 - .even - #elif defined(USE_MFP) LMFP_UCR = 0xfffa29 @@ -2706,7 +2721,7 @@ #ifdef MAC_USE_SCC_A /* Initialize channel A */ - movel %pc@(.Lmac_sccbase),%a0 + movel %pc@(SYMBOL_NAME(mac_sccbase)),%a0 lea %pc@(.Lscc_initable_mac),%a1 5: moveb %a1@+,%d0 jmi 6f @@ -2719,7 +2734,7 @@ #ifdef MAC_USE_SCC_B /* Initialize channel B */ #ifndef MAC_USE_SCC_A /* Load mac_sccbase only if needed */ - movel %pc@(.Lmac_sccbase),%a0 + movel %pc@(SYMBOL_NAME(mac_sccbase)),%a0 #endif /* MAC_USE_SCC_A */ lea %pc@(.Lscc_initable_mac),%a1 7: moveb %a1@+,%d0 @@ -2768,13 +2783,14 @@ is_not_mac(5f) #if defined(CONSOLE) - console_putc %d0 + movel %d0,%d7 + jsr .Lconsole_putc #endif /* CONSOLE */ #if defined(MAC_SERIAL_DEBUG) #ifdef MAC_USE_SCC_A - movel %pc@(.Lmac_sccbase),%a1 + movel %pc@(SYMBOL_NAME(mac_sccbase)),%a1 3: btst #2,%a1@(mac_scc_cha_a_ctrl_offset) jeq 3b moveb %d0,%a1@(mac_scc_cha_a_data_offset) @@ -2782,7 +2798,7 @@ #ifdef MAC_USE_SCC_B #ifndef MAC_USE_SCC_A /* Load mac_sccbase only if needed */ - movel %pc@(.Lmac_sccbase),%a1 + movel %pc@(SYMBOL_NAME(mac_sccbase)),%a1 #endif /* MAC_USE_SCC_A */ 4: btst #2,%a1@(mac_scc_cha_b_ctrl_offset) jeq 4b @@ -2946,11 +2962,11 @@ moveml %a0-%a4/%d0-%d7,%sp@- lea %pc@(SYMBOL_NAME(.Lconsole_globals)),%a2 - lea %pc@(.Lmac_videobase),%a0 + lea %pc@(SYMBOL_NAME(mac_videobase)),%a0 movel %a0@,%a1 - lea %pc@(.Lmac_rowbytes),%a0 + lea %pc@(SYMBOL_NAME(mac_rowbytes)),%a0 movel %a0@,%d5 - lea %pc@(.Lmac_dimensions),%a0 + lea %pc@(SYMBOL_NAME(mac_dimensions)),%a0 movel %a0@,%d3 /* -> low byte */ movel %d3,%d4 swap %d4 /* -> high byte */ @@ -2958,7 +2974,7 @@ andl #0xffff,%d4 /* d4 = screen height in pixels */ movel %d5,%d6 - subl #20,%d6 + subl #1,%d6 mulul %d4,%d6 /* scan line bytes x num scan lines */ divul #8,%d6 /* we'll clear 8 bytes at a time */ subq #1,%d6 @@ -3024,47 +3040,49 @@ */ moveml %a0/%d7,%sp@- - putr() - puts("MacLinux") - putr() - putr() + putr + puts "MacLinux" + putr + putr #if defined(SERIAL_DEBUG) - puts(" vidaddr:") - lea %pc@(.Lmac_videobase),%a0 + puts " vidaddr:" + lea %pc@(SYMBOL_NAME(mac_videobase)),%a0 movel %a0@,%d7 /* video addr. */ jbsr .Lserial_putnum /* This redirects to console */ - putr() + putr - puts(" _stext:") + puts " _stext:" lea %pc@(SYMBOL_NAME(_stext)),%a0 movel %a0,%d7 /* get start addr. */ jbsr .Lserial_putnum - putr() + putr - puts("bootinfo:") + puts "bootinfo:" lea %pc@(SYMBOL_NAME(_end)),%a0 movel %a0, %d7 /* write start addr. */ jbsr .Lserial_putnum - putr() + putr - puts(" kpt:") +#if 0 + puts " kpt:" lea %pc@(SYMBOL_NAME(kpt)),%a0 movel %a0,%d7 /* get start addr. */ jbsr .Lserial_putnum - putr() + putr - puts(" *kpt:") + puts " *kpt:" lea %pc@(SYMBOL_NAME(kpt)),%a0 movel %a0@,%d7 /* get start addr. */ jbsr .Lserial_putnum - putr() + putr +#endif - puts("cpuid:") + puts "cpuid:" lea %pc@(SYMBOL_NAME(.Lcputype)),%a0 movel %a0@,%d7 jbsr .Lserial_putnum - putr() + putr # if defined(MMU_PRINT) jbsr mmu_print_machine_cpu_types @@ -3082,7 +3100,7 @@ */ moveml %a0-%a1/%d0-%d7,%sp@- - lea %pc@(.Lmac_dimensions),%a0 + lea %pc@(SYMBOL_NAME(mac_dimensions)),%a0 movel %a0@,%d0 andil #0xffff,%d0 subil #64,%d0 /* snug up against the right edge */ @@ -3117,10 +3135,10 @@ * output a1 = dest * a2 = source */ - lea %pc@(.Lmac_videobase),%a0 + lea %pc@(SYMBOL_NAME(mac_videobase)),%a0 movel %a0@,%a1 movel %a1,%a2 - lea %pc@(.Lmac_rowbytes),%a0 + lea %pc@(SYMBOL_NAME(mac_rowbytes)),%a0 movel %a0@,%d5 movel %pc@(SYMBOL_NAME(.Lconsole_font)),%a0 mulul %a0@(FBCON_FONT_DESC_height),%d5 /* account for # scan lines per character */ @@ -3129,7 +3147,7 @@ /* * Get dimensions */ - lea %pc@(.Lmac_dimensions),%a0 + lea %pc@(SYMBOL_NAME(mac_dimensions)),%a0 movel %a0@,%d3 movel %d3,%d4 swap %d4 @@ -3139,7 +3157,7 @@ /* * Calculate number of bytes to move */ - lea %pc@(.Lmac_rowbytes),%a0 + lea %pc@(SYMBOL_NAME(mac_rowbytes)),%a0 movel %a0@,%d6 movel %pc@(SYMBOL_NAME(.Lconsole_font)),%a0 subl %a0@(FBCON_FONT_DESC_height),%d4 /* we're not scrolling the top row! */ @@ -3158,7 +3176,7 @@ movel %a2@+,%a1@+ dbra %d6,console_scroll_loop - lea %pc@(.Lmac_rowbytes),%a0 + lea %pc@(SYMBOL_NAME(mac_rowbytes)),%a0 movel %a0@,%d6 movel %pc@(SYMBOL_NAME(.Lconsole_font)),%a0 mulul %a0@(FBCON_FONT_DESC_height),%d6 /* scan line bytes x font height */ @@ -3228,12 +3246,12 @@ */ console_not_home: 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 cmpl %d1,%d0 jcs 1f movel %d7,%sp@- - putr() /* recursion is OK! */ + putr /* recursion is OK! */ movel %sp@+,%d7 1: movel %a0@(Lconsole_struct_cur_row),%d1 @@ -3296,11 +3314,11 @@ */ moveml %a0-%a1/%d0-%d4,%sp@- - lea %pc@(.Lmac_videobase),%a0 + lea %pc@(SYMBOL_NAME(mac_videobase)),%a0 movel %a0@,%a1 - lea %pc@(.Lmac_videodepth),%a0 + lea %pc@(SYMBOL_NAME(mac_videodepth)),%a0 movel %a0@,%d3 - lea %pc@(.Lmac_rowbytes),%a0 + lea %pc@(SYMBOL_NAME(mac_rowbytes)),%a0 mulul %a0@,%d1 /* @@ -3425,25 +3443,25 @@ */ .Lshowtest: moveml %a0/%d7,%sp@- - puts("A=") + puts "A=" putn(%a1) .long 0xf0119f15 | ptestr #5,%a1@,#7,%a0 - puts("DA=") + puts "DA=" putn(%a0) - puts("D=") + puts "D=" putn(%a0@) - puts("S=") + puts "S=" lea %pc@(.Lmmu),%a0 .long 0xf0106200 | pmove %psr,%a0@ clrl %d7 movew %a0@,%d7 jbsr .Lserial_putnum - putr() + putr moveml %sp@+,%a0/%d7 rts #endif /* 0 */ @@ -3451,7 +3469,7 @@ __INITDATA .align 4 -#if defined(CONFIG_ATARI) || defined(CONFIG_AMIGA) +#if defined(CONFIG_ATARI) || defined(CONFIG_AMIGA) || defined(CONFIG_HP300) .Lcustom: .Liobase: .long 0 @@ -3513,26 +3531,26 @@ #endif #endif +__FINIT + .data + .align 4 + #if defined(CONFIG_MAC) -SYMBOL_NAME_LABEL(.Lmac_booter_data) +SYMBOL_NAME_LABEL(mac_booter_data) .long 0 -SYMBOL_NAME_LABEL(.Lmac_videobase) +SYMBOL_NAME_LABEL(mac_videobase) .long 0 -SYMBOL_NAME_LABEL(.Lmac_videodepth) +SYMBOL_NAME_LABEL(mac_videodepth) .long 0 -SYMBOL_NAME_LABEL(.Lmac_dimensions) +SYMBOL_NAME_LABEL(mac_dimensions) .long 0 -SYMBOL_NAME_LABEL(.Lmac_rowbytes) +SYMBOL_NAME_LABEL(mac_rowbytes) .long 0 #ifdef MAC_SERIAL_DEBUG -SYMBOL_NAME_LABEL(.Lmac_sccbase) +SYMBOL_NAME_LABEL(mac_sccbase) .long 0 #endif /* MAC_SERIAL_DEBUG */ #endif - -__FINIT - .data - .align 4 SYMBOL_NAME_LABEL(availmem) .long 0 --------------BDCF98768F93BC16BD046215--