1 diff -ruN proll_18.orig/Makefile proll-patch4/Makefile
2 --- proll_18.orig/Makefile 2002-09-13 14:16:59.000000000 +0000
3 +++ proll-patch4/Makefile 2004-11-13 15:50:49.000000000 +0000
7 make -C espresso-ser all
11 make -C mrcoffee clean
13 make -C krups-ser clean
14 make -C espresso clean
15 make -C espresso-ser clean
17 diff -ruN proll_18.orig/qemu/head.S proll-patch4/qemu/head.S
18 --- proll_18.orig/qemu/head.S 1970-01-01 00:00:00.000000000 +0000
19 +++ proll-patch4/qemu/head.S 2004-11-13 15:50:49.000000000 +0000
22 + ** Standalone startup code for Linux PROM emulator.
23 + ** Copyright 1999 Pete A. Zaitcev
24 + ** This code is licensed under GNU General Public License.
27 + * $Id: proll.patch,v 1.2 2004-12-19 23:18:01 bellard Exp $
33 +/* #include <asm/head.h> */ /* Trap entries. Do not use. */
36 +#define C_LABEL(name) name
37 +#define REGWIN_SZ 0x40
39 +#define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */
41 + /* 22 is 24-2, (va)>>(SRMMU_PGDIR_SHIFT-PTESIZESHFT) */
42 +#define VATOPGDOFF(va) (((va)>>22)&0x3FC)
43 +#define VATOPMDOFF(va) (((va)>>16)&0xFC)
45 +#define NOP_INSN 0x01000000 /* Used to patch sparc_save_state */
47 +/* Here are some trap goodies */
50 +/* Generic trap entry. */
51 +#define TRAP_ENTRY(type, label) \
52 + rd %psr, %l0; b label; rd %wim, %l3; nop;
55 +/* Data/text faults. */
56 +#define SRMMU_TFAULT rd %psr, %l0; rd %wim, %l3; b C_LABEL(srmmu_fault); mov 1, %l7;
57 +#define SRMMU_DFAULT rd %psr, %l0; rd %wim, %l3; b C_LABEL(srmmu_fault); mov 0, %l7;
60 +/* This is for traps we should NEVER get. */
61 +#define BAD_TRAP(num) \
62 + rd %psr, %l0; mov num, %l7; b bad_trap_handler; rd %wim, %l3;
64 +/* This is for traps when we want just skip the instruction which caused it */
65 +#define SKIP_TRAP(type, name) \
66 + jmpl %l2, %g0; rett %l2 + 4; nop; nop;
68 +/* Notice that for the system calls we pull a trick. We load up a
69 + * different pointer to the system call vector table in %l7, but call
70 + * the same generic system call low-level entry point. The trap table
71 + * entry sequences are also HyperSparc pipeline friendly ;-)
74 +/* Software trap for Linux system calls. */
75 +#define LINUX_SYSCALL_TRAP \
76 + sethi %hi(C_LABEL(sys_call_table)), %l7; \
77 + or %l7, %lo(C_LABEL(sys_call_table)), %l7; \
78 + b linux_sparc_syscall; \
81 +/* Software trap for SunOS4.1.x system calls. */
82 +#define SUNOS_SYSCALL_TRAP \
84 + sethi %hi(C_LABEL(sunos_sys_table)), %l7; \
85 + b linux_sparc_syscall; \
86 + or %l7, %lo(C_LABEL(sunos_sys_table)), %l7;
88 +/* Software trap for Slowaris system calls. */
89 +#define SOLARIS_SYSCALL_TRAP \
90 + b solaris_syscall; \
95 +#define INDIRECT_SOLARIS_SYSCALL(x) \
97 + b solaris_syscall; \
101 +#define BREAKPOINT_TRAP \
102 + b breakpoint_trap; \
107 +/* Software trap for Sparc-netbsd system calls. */
108 +#define NETBSD_SYSCALL_TRAP \
109 + sethi %hi(C_LABEL(sys_call_table)), %l7; \
110 + or %l7, %lo(C_LABEL(sys_call_table)), %l7; \
114 +/* The Get Condition Codes software trap for userland. */
115 +#define GETCC_TRAP \
116 + b getcc_trap_handler; mov %psr, %l0; nop; nop;
118 +/* The Set Condition Codes software trap for userland. */
119 +#define SETCC_TRAP \
120 + b setcc_trap_handler; mov %psr, %l0; nop; nop;
122 +/* This is for hard interrupts from level 1-14, 15 is non-maskable (nmi) and
123 + * gets handled with another macro.
125 +#define TRAP_ENTRY_INTERRUPT(int_level) \
126 + mov int_level, %l7; rd %psr, %l0; b real_irq_entry; rd %wim, %l3;
128 +/* NMI's (Non Maskable Interrupts) are special, you can't keep them
129 + * from coming in, and basically if you get one, the shows over. ;(
130 + * On the sun4c they are usually asynchronous memory errors, on the
131 + * the sun4m they could be either due to mem errors or a software
132 + * initiated interrupt from the prom/kern on an SMP box saying "I
133 + * command you to do CPU tricks, read your mailbox for more info."
136 + rd %wim, %l3; b linux_trap_nmi_sun4c; mov %psr, %l0; nop;
140 +/* Window overflows/underflows are special and we need to try to be as
141 + * efficient as possible here....
143 +#define WINDOW_SPILL \
144 + rd %psr, %l0; rd %wim, %l3; b spill_window_entry; nop;
146 +#define WINDOW_FILL \
147 + rd %psr, %l0; rd %wim, %l3; b fill_window_entry; nop;
149 +#define STUB_TRAP ba stub_trap; nop; nop; nop;
151 +#define TRAP_ENTRY(a,b) STUB_TRAP
152 +#define SKIP_TRAP(a,b) STUB_TRAP
153 +#define SUNOS_SYSCALL_TRAP STUB_TRAP
154 +#define SOLARIS_SYSCALL_TRAP STUB_TRAP
155 +#define NETBSD_SYSCALL_TRAP STUB_TRAP
156 +#define LINUX_SYSCALL_TRAP STUB_TRAP
157 +#define BREAKPOINT_TRAP STUB_TRAP
158 +#define NMI_TRAP STUB_TRAP
159 +#define GETCC_TRAP STUB_TRAP
160 +#define SETCC_TRAP STUB_TRAP
161 +#define BAD_TRAP(n) STUB_TRAP
162 +#define TRAP_ENTRY_INTERRUPT(i) STUB_TRAP
163 +#define INDIRECT_SOLARIS_SYSCALL(i) STUB_TRAP
166 + .globl start, _start
169 + .globl spill_window_entry, fill_window_entry
171 +t_zero: b goprol; nop; nop; nop;
172 +t_tflt: SRMMU_TFAULT /* Inst. Access Exception */
173 +t_bins: TRAP_ENTRY(0x2, bad_instruction) /* Illegal Instruction */
174 +t_pins: TRAP_ENTRY(0x3, priv_instruction) /* Privileged Instruction */
175 +t_fpd: TRAP_ENTRY(0x4, fpd_trap_handler) /* Floating Point Disabled */
176 +t_wovf: WINDOW_SPILL /* Window Overflow */
177 +t_wunf: WINDOW_FILL /* Window Underflow */
178 +t_mna: TRAP_ENTRY(0x7, mna_handler) /* Memory Address Not Aligned */
179 +t_fpe: TRAP_ENTRY(0x8, fpe_trap_handler) /* Floating Point Exception */
180 +t_dflt: SRMMU_DFAULT /* Data Miss Exception */
181 +t_tio: TRAP_ENTRY(0xa, do_tag_overflow) /* Tagged Instruction Ovrflw */
182 +t_wpt: TRAP_ENTRY(0xb, do_watchpoint) /* Watchpoint Detected */
183 +t_badc: BAD_TRAP(0xc) BAD_TRAP(0xd) BAD_TRAP(0xe) BAD_TRAP(0xf) BAD_TRAP(0x10)
184 +t_irq1: TRAP_ENTRY_INTERRUPT(1) /* IRQ Software/SBUS Level 1 */
185 +t_irq2: TRAP_ENTRY_INTERRUPT(2) /* IRQ SBUS Level 2 */
186 +t_irq3: TRAP_ENTRY_INTERRUPT(3) /* IRQ SCSI/DMA/SBUS Level 3 */
187 +t_irq4: TRAP_ENTRY_INTERRUPT(4) /* IRQ Software Level 4 */
188 +t_irq5: TRAP_ENTRY_INTERRUPT(5) /* IRQ SBUS/Ethernet Level 5 */
189 +t_irq6: TRAP_ENTRY_INTERRUPT(6) /* IRQ Software Level 6 */
190 +t_irq7: TRAP_ENTRY_INTERRUPT(7) /* IRQ Video/SBUS Level 5 */
191 +t_irq8: TRAP_ENTRY_INTERRUPT(8) /* IRQ SBUS Level 6 */
192 +t_irq9: TRAP_ENTRY_INTERRUPT(9) /* IRQ SBUS Level 7 */
193 +t_irq10:TRAP_ENTRY_INTERRUPT(10) /* IRQ Timer #1 (one we use) */
194 +t_irq11:TRAP_ENTRY_INTERRUPT(11) /* IRQ Floppy Intr. */
195 +t_irq12:TRAP_ENTRY_INTERRUPT(12) /* IRQ Zilog serial chip */
196 +t_irq13:TRAP_ENTRY_INTERRUPT(13) /* IRQ Audio Intr. */
197 +t_irq14:TRAP_ENTRY_INTERRUPT(14) /* IRQ Timer #2 */
198 +t_nmi: NMI_TRAP /* Level 15 (NMI) */
199 +t_racc: TRAP_ENTRY(0x20, do_reg_access) /* General Register Access Error */
200 +t_iacce:BAD_TRAP(0x21) /* Instr Access Error */
201 +t_bad22:BAD_TRAP(0x22) BAD_TRAP(0x23)
202 +t_cpdis:TRAP_ENTRY(0x24, do_cp_disabled) /* Co-Processor Disabled */
203 +t_uflsh:SKIP_TRAP(0x25, unimp_flush) /* Unimplemented FLUSH inst. */
204 +t_bad26:BAD_TRAP(0x26) BAD_TRAP(0x27)
205 +t_cpexc:TRAP_ENTRY(0x28, do_cp_exception) /* Co-Processor Exception */
206 +t_dacce:SRMMU_DFAULT /* Data Access Error */
207 +t_hwdz: TRAP_ENTRY(0x2a, do_hw_divzero) /* Division by zero, you lose... */
208 +t_dserr:BAD_TRAP(0x2b) /* Data Store Error */
209 +t_daccm:BAD_TRAP(0x2c) /* Data Access MMU-Miss */
210 +t_bad2d: BAD_TRAP(0x2d) BAD_TRAP(0x2e) BAD_TRAP(0x2f)
211 + BAD_TRAP(0x30) BAD_TRAP(0x31) BAD_TRAP(0x32) BAD_TRAP(0x33)
212 + BAD_TRAP(0x34) BAD_TRAP(0x35) BAD_TRAP(0x36) BAD_TRAP(0x37)
213 + BAD_TRAP(0x38) BAD_TRAP(0x39) BAD_TRAP(0x3a) BAD_TRAP(0x3b)
214 +t_iaccm:BAD_TRAP(0x3c) /* Instr Access MMU-Miss */
215 + BAD_TRAP(0x3d) BAD_TRAP(0x3e) BAD_TRAP(0x3f)
216 + BAD_TRAP(0x40) BAD_TRAP(0x41) BAD_TRAP(0x42) BAD_TRAP(0x43)
217 + BAD_TRAP(0x44) BAD_TRAP(0x45) BAD_TRAP(0x46) BAD_TRAP(0x47)
218 + BAD_TRAP(0x48) BAD_TRAP(0x49) BAD_TRAP(0x4a) BAD_TRAP(0x4b)
219 + BAD_TRAP(0x4c) BAD_TRAP(0x4d) BAD_TRAP(0x4e) BAD_TRAP(0x4f)
220 + BAD_TRAP(0x50) BAD_TRAP(0x51) BAD_TRAP(0x52) BAD_TRAP(0x53)
221 + BAD_TRAP(0x54) BAD_TRAP(0x55) BAD_TRAP(0x56) BAD_TRAP(0x57)
222 + BAD_TRAP(0x58) BAD_TRAP(0x59) BAD_TRAP(0x5a) BAD_TRAP(0x5b)
223 + BAD_TRAP(0x5c) BAD_TRAP(0x5d) BAD_TRAP(0x5e) BAD_TRAP(0x5f)
224 + BAD_TRAP(0x60) BAD_TRAP(0x61) BAD_TRAP(0x62) BAD_TRAP(0x63)
225 + BAD_TRAP(0x64) BAD_TRAP(0x65) BAD_TRAP(0x66) BAD_TRAP(0x67)
226 + BAD_TRAP(0x68) BAD_TRAP(0x69) BAD_TRAP(0x6a) BAD_TRAP(0x6b)
227 + BAD_TRAP(0x6c) BAD_TRAP(0x6d) BAD_TRAP(0x6e) BAD_TRAP(0x6f)
228 + BAD_TRAP(0x70) BAD_TRAP(0x71) BAD_TRAP(0x72) BAD_TRAP(0x73)
229 + BAD_TRAP(0x74) BAD_TRAP(0x75) BAD_TRAP(0x76) BAD_TRAP(0x77)
230 + BAD_TRAP(0x78) BAD_TRAP(0x79) BAD_TRAP(0x7a) BAD_TRAP(0x7b)
231 + BAD_TRAP(0x7c) BAD_TRAP(0x7d) BAD_TRAP(0x7e) BAD_TRAP(0x7f)
232 +t_sunos:SUNOS_SYSCALL_TRAP /* SunOS System Call */
233 +t_sbkpt:BREAKPOINT_TRAP /* Software Breakpoint/KGDB */
234 +t_divz: BAD_TRAP(0x82) /* Divide by zero trap */
235 +t_flwin:TRAP_ENTRY(0x83, do_flush_windows) /* Flush Windows Trap */
236 +t_clwin:BAD_TRAP(0x84) /* Clean Windows Trap */
237 +t_rchk: BAD_TRAP(0x85) /* Range Check */
238 +t_funal:BAD_TRAP(0x86) /* Fix Unaligned Access Trap */
239 +t_iovf: BAD_TRAP(0x87) /* Integer Overflow Trap */
240 +t_slowl:SOLARIS_SYSCALL_TRAP /* Slowaris System Call */
241 +t_netbs:NETBSD_SYSCALL_TRAP /* Net-B.S. System Call */
242 +t_bad8a:BAD_TRAP(0x8a) BAD_TRAP(0x8b) BAD_TRAP(0x8c) BAD_TRAP(0x8d)
243 + BAD_TRAP(0x8e) BAD_TRAP(0x8f)
244 +t_linux:LINUX_SYSCALL_TRAP /* Linux System Call */
245 +t_bad91:BAD_TRAP(0x91) BAD_TRAP(0x92) BAD_TRAP(0x93)
246 + BAD_TRAP(0x94) BAD_TRAP(0x95) BAD_TRAP(0x96) BAD_TRAP(0x97)
247 + BAD_TRAP(0x98) BAD_TRAP(0x99) BAD_TRAP(0x9a) BAD_TRAP(0x9b) BAD_TRAP(0x9c) BAD_TRAP(0x9d) BAD_TRAP(0x9e) BAD_TRAP(0x9f)
248 +t_getcc:GETCC_TRAP /* Get Condition Codes */
249 +t_setcc:SETCC_TRAP /* Set Condition Codes */
250 +t_bada2:BAD_TRAP(0xa2) BAD_TRAP(0xa3)
251 + BAD_TRAP(0xa4) BAD_TRAP(0xa5) BAD_TRAP(0xa6)
252 +t_slowi:INDIRECT_SOLARIS_SYSCALL(156)
253 + BAD_TRAP(0xa8) BAD_TRAP(0xa9) BAD_TRAP(0xaa) BAD_TRAP(0xab)
254 + BAD_TRAP(0xac) BAD_TRAP(0xad) BAD_TRAP(0xae) BAD_TRAP(0xaf)
255 + BAD_TRAP(0xb0) BAD_TRAP(0xb1) BAD_TRAP(0xb2) BAD_TRAP(0xb3)
256 + BAD_TRAP(0xb4) BAD_TRAP(0xb5) BAD_TRAP(0xb6) BAD_TRAP(0xb7)
257 + BAD_TRAP(0xb8) BAD_TRAP(0xb9) BAD_TRAP(0xba) BAD_TRAP(0xbb)
258 + BAD_TRAP(0xbc) BAD_TRAP(0xbd) BAD_TRAP(0xbe) BAD_TRAP(0xbf)
259 +t_badc0:BAD_TRAP(0xc0) BAD_TRAP(0xc1) BAD_TRAP(0xc2) BAD_TRAP(0xc3)
260 + BAD_TRAP(0xc4) BAD_TRAP(0xc5) BAD_TRAP(0xc6) BAD_TRAP(0xc7)
261 + BAD_TRAP(0xc8) BAD_TRAP(0xc9) BAD_TRAP(0xca) BAD_TRAP(0xcb)
262 + BAD_TRAP(0xcc) BAD_TRAP(0xcd) BAD_TRAP(0xce) BAD_TRAP(0xcf)
263 + BAD_TRAP(0xd0) BAD_TRAP(0xd1) BAD_TRAP(0xd2) BAD_TRAP(0xd3)
264 +t_badd4:BAD_TRAP(0xd4) BAD_TRAP(0xd5) BAD_TRAP(0xd6) BAD_TRAP(0xd7)
265 + BAD_TRAP(0xd8) BAD_TRAP(0xd9) BAD_TRAP(0xda) BAD_TRAP(0xdb)
266 + BAD_TRAP(0xdc) BAD_TRAP(0xdd) BAD_TRAP(0xde) BAD_TRAP(0xdf)
267 + BAD_TRAP(0xe0) BAD_TRAP(0xe1) BAD_TRAP(0xe2) BAD_TRAP(0xe3)
268 + BAD_TRAP(0xe4) BAD_TRAP(0xe5) BAD_TRAP(0xe6) BAD_TRAP(0xe7)
269 +t_bade8:BAD_TRAP(0xe8) BAD_TRAP(0xe9) BAD_TRAP(0xea) BAD_TRAP(0xeb)
270 + BAD_TRAP(0xec) BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef)
271 + BAD_TRAP(0xf0) BAD_TRAP(0xf1) BAD_TRAP(0xf2) BAD_TRAP(0xf3)
272 + BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6) BAD_TRAP(0xf7)
273 + BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
274 +t_badfc:BAD_TRAP(0xfc) BAD_TRAP(0xfd)
275 +dbtrap: BAD_TRAP(0xfe) /* Debugger/PROM breakpoint #1 */
276 +dbtrap2:BAD_TRAP(0xff) /* Debugger/PROM breakpoint #2 */
279 + set (PHYS_JJ_TCX_FB + 0xbf0), %g5 /* 2 cells from side */
280 + set 0x00ffffff, %g4
281 + sta %g4, [%g5] ASI_M_BYPASS
287 + .align 0x1000 ! PAGE_SIZE
288 + .globl C_LABEL(bootup_user_stack)
289 + .type bootup_user_stack,#object
290 + .size bootup_user_stack,0x2000
291 +C_LABEL(bootup_user_stack): .skip 0x2000
296 + ! %g1 contains end of memory
297 + ! map PROLDATA to PROLBASE+PROLSIZE to end of ram
298 + set PROLSIZE+0x1000-PROLDATA+PROLBASE, %g2 ! add 0x1000 for temp tables
299 + sub %g1, %g2, %g2 ! start of private memory
300 + srl %g2, 0x4, %g7 ! ctx table at s+0x0
301 + add %g2, 0x400, %g3 ! l1 table at s+0x400
304 + sta %g3, [%g2] ASI_M_BYPASS
305 + add %g2, 0x400, %g2 ! s+0x400
306 + add %g2, 0x800, %g3 ! l2 table for ram (00xxxxxx) at s+0x800
309 + sta %g3, [%g2] ASI_M_BYPASS
310 + add %g2, 0x500, %g3 ! l2 table for rom (ffxxxxxx) at s+0x900
311 + add %g2, 0x3fc, %g2 ! s+0x7fc
314 + sta %g3, [%g2] ASI_M_BYPASS
315 + add %g2, 0x4, %g2 ! s+0x800
316 + set ((7 << 2) | 2), %g3 ! 7 = U: --- S: RWX (main memory)
317 + sta %g3, [%g2] ASI_M_BYPASS
318 + add %g2, 0x200, %g3 ! l3 table for rom at s+0xa00
319 + add %g2, 0x1d0, %g2 ! s+0x9d0
322 + sta %g3, [%g2] ASI_M_BYPASS
323 + add %g2, 0x30, %g2 ! s+0xa00
327 + set (PROLDATA-PROLBASE)/0x1000, %g6 ! # of .text pages
328 +1: srl %g3, 0x4, %g4
329 + or %g4, ((7 << 2) | 2), %g4 ! 4 = U: --X S: --X (rom, execute only)
330 + sta %g4, [%g2] ASI_M_BYPASS
337 + set (PROLDATA-PROLRODATA)/0x1000, %g6 ! # of .rodata pages
338 +1: srl %g3, 0x4, %g4
339 + or %g4, ((0 << 2) | 2), %g4 ! 0 = U: R-- S: R-- (rom, read only)
340 + sta %g4, [%g2] ASI_M_BYPASS
347 + set (PROLBASE+PROLSIZE-PROLDATA)/0x1000, %g6 ! # of .bss pages
351 +1: srl %g3, 0x4, %g4
352 + or %g4, ((7 << 2) | 2), %g4 ! 5 = U: R-- S: RW- (data area, read/write)
353 + sta %g4, [%g2] ASI_M_BYPASS
363 + sta %g7, [%g2] ASI_M_MMUREGS ! set ctx table ptr
365 + sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu
368 + * The code which enables traps is a simplified version of
371 + * We know number of windows as 8 so we do not calculate them.
372 + * The deadwood is here for any case.
375 + /* Turn on Supervisor, EnableFloating, and all the PIL bits.
376 + * Also puts us in register window zero with traps off.
378 + set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2
382 + /* I want a kernel stack NOW! */
383 + set C_LABEL(bootup_user_stack), %g1
384 + set (0x2000 - REGWIN_SZ), %g2
386 + mov 0, %fp /* And for good luck */
388 + /* Zero out our BSS section. */
389 + set C_LABEL(bss_start) , %o0 ! First address of BSS
390 + set C_LABEL(end) , %o1 ! Last address of BSS
396 + subcc %o0, %o1, %g0
400 + sethi %hi( C_LABEL(ram_size) ), %o0
401 + st %g3, [%o0 + %lo( C_LABEL(ram_size) )]
404 + wr %g1, 0x0, %wim ! make window 1 invalid
413 + and %g3, PSR_CWP, %g3
420 + sethi %hi( C_LABEL(cputyp) ), %o0
421 + st %g7, [%o0 + %lo( C_LABEL(cputyp) )]
423 + sethi %hi( C_LABEL(nwindows) ), %g4
424 + st %g3, [%g4 + %lo( C_LABEL(nwindows) )]
427 + sethi %hi( C_LABEL(nwindowsm1) ), %g4
428 + st %g3, [%g4 + %lo( C_LABEL(nwindowsm1) )]
431 + /* Here we go, start using Linux's trap table... */
432 + set C_LABEL(trapbase), %g3
436 + /* Finally, turn on traps so that we can call c-code. */
441 + wr %g3, PSR_ET, %psr
445 + call C_LABEL(prolmain)
453 + * Memory access trap handler
454 + * %l0 program %psr from trap table entry
455 + * %l1 program %pc from hardware
456 + * %l2 program %npc from hardware
457 + * %l3 program %wim from trap table entry
461 + * %l7 text flag from trap table entry
466 +C_LABEL(srmmu_fault):
470 + lda [%l6] ASI_M_MMUREGS, %l6
471 + lda [%l5] ASI_M_MMUREGS, %l5
473 + set ignore_fault, %l5
475 + subcc %l5, %g0, %g0 /* NULL pointer trap faults always */
478 + subcc %l5, %l6, %g0
483 + set (PHYS_JJ_TCX_FB + 0xbf0), %g5 /* 2 cells from side */
484 + set 0x00ffffff, %g4
485 + sta %g4, [%g5] ASI_M_BYPASS
486 + add %g5, 8, %g5 /* On right side */
487 + sta %g4, [%g5] ASI_M_BYPASS
491 + set C_LABEL(fault_ignored), %l5
496 + * Skip the faulting instruction.
497 + * I think it works when next instruction is a branch even.
508 + * Slow external versions of st_bypass and ld_bypass.
509 + * rconsole.c uses inlines. We call these in places which are not speed
510 + * critical, to avoid compiler bugs.
512 + .globl C_LABEL(st_bypass)
515 + sta %o1, [%o0] ASI_M_BYPASS
516 + .globl C_LABEL(ld_bypass)
519 + lda [%o0] ASI_M_BYPASS, %o0
520 + .globl C_LABEL(sth_bypass)
521 +C_LABEL(sth_bypass):
523 + stha %o1, [%o0] ASI_M_BYPASS
524 + .globl C_LABEL(ldh_bypass)
525 +C_LABEL(ldh_bypass):
527 + lduha [%o0] ASI_M_BYPASS, %o0
528 + .globl C_LABEL(stb_bypass)
529 +C_LABEL(stb_bypass):
531 + stba %o1, [%o0] ASI_M_BYPASS
532 + .globl C_LABEL(ldb_bypass)
533 +C_LABEL(ldb_bypass):
535 + lduba [%o0] ASI_M_BYPASS, %o0
536 diff -ruN proll_18.orig/qemu/main.c proll-patch4/qemu/main.c
537 --- proll_18.orig/qemu/main.c 1970-01-01 00:00:00.000000000 +0000
538 +++ proll-patch4/qemu/main.c 2004-11-23 19:05:34.000000000 +0000
541 + ** Proll (PROM replacement)
542 + ** Copyright 1999 Pete Zaitcev
543 + ** This code is licensed under GNU General Public License.
547 +// #include <asm/contregs.h>
549 +#include "pgtsrmmu.h"
550 +#include "iommu.h" /* Typical SBus IOMMU for sun4m */
551 +#include "phys_jj.h"
552 +#include "vconsole.h"
553 +#include "version.h"
554 +#include <general.h> /* __P() */
555 +#include <net.h> /* init_net() */
556 +#include <romlib.h> /* we are a provider for part of this. */
557 +#include <netpriv.h> /* myipaddr */
559 +#include <system.h> /* our own prototypes */
561 +static void init_idprom(void);
562 +static void makepages_q(struct phym *t, unsigned int highbase);
564 +struct vconterm dp0;
565 +struct mem cmem; /* Current memory, virtual */
566 +struct mem cio; /* Current I/O space */
567 +struct phym pmem; /* Current phys. mem. */
568 +struct iommu ciommu; /* Our IOMMU on sun4m */
570 +static char *hw_idprom;
571 +int ignore_fault, fault_ignored, ram_size;
577 + //static const char fname[14] = "00000000.PROL";
578 + static struct banks bb;
579 + unsigned int hiphybas;
580 + const void *romvec;
582 + vcon_init(&dp0, PHYS_JJ_TCX_FB);
583 + printk("PROLL %s QEMU\n", PROLL_VERSION_STRING);
584 + printk("%d MB total\n", ram_size/(1024*1024));
587 + bb.bankv[0].start = 0;
588 + bb.bankv[0].length = ram_size;
590 + hiphybas = ram_size - PROLSIZE;
592 + mem_init(&cmem, (char *) &_end, (char *)(PROLBASE+PROLSIZE));
593 + makepages_q(&pmem, hiphybas);
594 + init_mmu_swift((unsigned int)pmem.pctp - PROLBASE + hiphybas);
596 + mem_init(&cio, (char *)(PROLBASE+PROLSIZE),
597 + (char *)(PROLBASE+PROLSIZE+IOMAPSIZE));
599 + iommu_init(&ciommu, hiphybas);
610 + if (rarp() != 0) fatal();
612 + xtoa(myipaddr, fname, 8);
613 + if (load(servaddr, fname) != 0) fatal();
615 + if (bootp() != 0) fatal();
617 + * boot_rec.bp_file cannot be used because system PROM
618 + * uses it to locate ourselves. If we load from boot_rec.bp_file,
619 + * we will loop reloading PROLL over and over again.
620 + * Thus we use traditional PROLL scheme HEXIPADDR.PROL (single L).
622 + xtoa(myipaddr, fname, 8);
623 + if (load(boot_rec.bp_siaddr, fname) != 0) fatal();
627 + romvec = init_openprom(bb.nbanks, bb.bankv, hiphybas);
629 + printk("Memory used: virt 0x%x:0x%x[%dK] iomap 0x%x:0x%x\n",
630 + PROLBASE, (int)cmem.curp, ((unsigned) cmem.curp - PROLBASE)/1024,
631 + (int)cio.start, (int)cio.curp);
632 + //set_timeout(5); while (!chk_timeout()) { } /* P3: let me read */
635 + void (*entry)(const void *, int, int, int, int) = (void (*)(const void*, int, int, int, int)) LOADBASE;
636 + entry(romvec, 0, 0, 0, 0);
644 + * dvma_alloc over iommu_alloc.
646 +void *dvma_alloc(int size, unsigned int *pphys)
648 + return iommu_alloc(&ciommu, size, pphys);
653 +void udelay(unsigned long usecs)
657 + for (i = 0; i < n; i++) { }
660 +static void init_idprom()
664 + if ((va_prom = map_io(PHYS_JJ_EEPROM, PHYS_JJ_EEPROM_SIZE)) == NULL) {
665 + printk("init_idprom: cannot map eeprom\n");
668 + bcopy(va_prom + PHYS_JJ_IDPROM_OFF, idprom, IDPROM_SIZE);
670 + * hw_idprom is not used anywhere.
671 + * It's just as we hate to leave hanging pointers (I/O page here).
673 + hw_idprom = va_prom;
677 + * Make CPU page tables.
678 + * Returns pointer to context table.
679 + * Here we ignore memory allocation errors which "should not happen"
680 + * because we cannot print anything anyways if memory initialization fails.
682 +void makepages_q(struct phym *t, unsigned int highbase)
684 + unsigned int *ctp, *l1, pte;
686 + unsigned int pa, va;
688 + ctp = mem_zalloc(&cmem, NCTX_SWIFT*sizeof(int), NCTX_SWIFT*sizeof(int));
689 + l1 = mem_zalloc(&cmem, 256*sizeof(int), 256*sizeof(int));
691 + pte = SRMMU_ET_PTD | (((unsigned int)l1 - PROLBASE + highbase) >> 4);
692 + for (i = 0; i < NCTX_SWIFT; i++) {
697 + for (va = PROLBASE; va < PROLDATA; va += PAGE_SIZE) {
698 + map_page(l1, va, pa, 0, highbase);
701 + pa = highbase + PROLDATA - PROLBASE;
702 + for (va = PROLDATA; va < PROLBASE + PROLSIZE; va += PAGE_SIZE) {
703 + map_page(l1, va, pa, 0, highbase);
707 + /* We need to start from LOADBASE, but kernel wants PAGE_SIZE. */
709 + for (va = 0; va < LOWMEMSZ; va += PAGE_SIZE) {
710 + map_page(l1, va, pa, 0, highbase);
716 + t->pbas = highbase;
718 diff -ruN proll_18.orig/qemu/Makefile proll-patch4/qemu/Makefile
719 --- proll_18.orig/qemu/Makefile 1970-01-01 00:00:00.000000000 +0000
720 +++ proll-patch4/qemu/Makefile 2004-11-13 15:50:49.000000000 +0000
724 +# qemu/Makefile - make PROLL for QEMU
725 +# $Id: proll.patch,v 1.2 2004-12-19 23:18:01 bellard Exp $
727 +# Copyright 1999 Pete Zaitcev
728 +# This is Free Software is licensed under terms of GNU General Public License.
733 +#CROSS = /usr/local/sparc/bin/sparc-sun-linux-
734 +CROSS = sparc-unknown-linux-gnu-
736 +CROSSCC = $(CROSS)gcc
737 +CROSSLD = $(CROSS)ld
738 +CROSSNM = $(CROSS)nm
741 +ELFTOAOUT = elftoaout
746 +# Due to remapping algorithm PROLBASE should be algned on PMD.
747 +# We make PROLBASE a define instead of using _start because we
748 +# want to shift it to form a PGD entry. A relocatable label will not work.
749 +# Linux kernel expects us to be at LINUX_OPPROM_BEGVM <asm-sparc/openprom.h>.
750 +PROLBASE = 0xffd00000
751 +PROLRODATA = 0xffd07000
752 +PROLDATA = 0xffd09000
753 +PROLSIZE = (240*1024)
756 +# Fixed %g6 is for arch/sparc/kernel/head.S, it seems ok w/o -ffixed-g6.
757 +# Kernel uses -fcall-used-g5 -fcall-used-g7, we probably do not need them.
758 +# __ANSI__ is supposed to be on by default but it is not.
759 +CFLAGS = -O2 -Wall -DPROLBASE=$(PROLBASE) -DPROLDATA=$(PROLDATA) -DPROLRODATA=$(PROLRODATA) -D__ANSI__=1 -I$(SRC) -mcpu=hypersparc -g
760 +ASFLAGS = -D__ASSEMBLY__ -I$(SRC) -DPROLRODATA=$(PROLRODATA) -DPROLDATA=$(PROLDATA) -DPROLSIZE=$(PROLSIZE) -g
761 +# Solaris or Linux/i386 cross compilation
762 +#CFLAGS = -Iinclude -O
764 +LDFLAGS = -N -Ttext $(PROLBASE) --section-start .rodata=$(PROLRODATA) -Tdata $(PROLDATA) -Tbss $(PROLDATA)
767 +PROLLEXE = proll.elf
769 +OBJS = head.o wuf.o wof.o main.o vconsole.o hconsole.o rconsole.o \
770 + printf.o le.o system.o iommu.o \
771 + arp.o netinit.o bootp.o packet.o tftp.o udp.o sched_4m.o openprom.o
775 +$(PROLLEXE): $(OBJS)
776 + $(CROSSLD) $(LDFLAGS) -o $(PROLLEXE) $(OBJS)
778 +head.o: head.S $(SRC)/phys_jj.h \
779 + $(SRC)/asi.h $(SRC)/psr.h $(SRC)/crs.h
780 + $(CROSSCC) $(ASFLAGS) -DPROLBASE=$(PROLBASE) -o $*.o -c $*.S
782 +main.o: main.c $(SRC)/asi.h $(SRC)/pgtsrmmu.h $(SRC)/iommu.h \
783 + $(SRC)/phys_jj.h $(SRC)/vconsole.h $(SRC)/version.h $(SRC)/general.h \
784 + $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arpa.h $(SRC)/system.h
785 + $(CROSSCC) $(CFLAGS) -c $*.c
786 +openprom.o: openprom.c $(SRC)/openprom.h $(SRC)/general.h $(SRC)/romlib.h \
787 + $(SRC)/vconsole.h $(SRC)/system.h $(SRC)/phys_jj.h
788 + $(CROSSCC) $(CFLAGS) -c $*.c
790 +system.o: $(SRC)/system.c $(SRC)/vconsole.h $(SRC)/pgtsrmmu.h \
791 + $(SRC)/timer.h $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/asi.h \
792 + $(SRC)/netpriv.h $(SRC)/arpa.h $(SRC)/system.h $(SRC)/crs.h
793 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
794 +iommu.o: $(SRC)/iommu.c $(SRC)/pgtsrmmu.h $(SRC)/phys_jj.h $(SRC)/iommu.h \
795 + $(SRC)/vconsole.h $(SRC)/general.h $(SRC)/romlib.h $(SRC)/system.h $(SRC)/asi.h
796 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
797 +vconsole.o: $(SRC)/vconsole.c $(SRC)/vconsole.h $(SRC)/hconsole.h
798 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
799 +hconsole.o: $(SRC)/hconsole.c $(SRC)/hconsole.h $(SRC)/rconsole.h $(SRC)/phys_jj.h
800 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
801 +rconsole.o: $(SRC)/rconsole.c $(SRC)/rconsole.h
802 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
803 +printf.o: $(SRC)/printf.c
804 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
805 +le.o: $(SRC)/le.c $(SRC)/dma.h $(SRC)/system.h $(SRC)/netpriv.h $(SRC)/romlib.h $(SRC)/general.h $(SRC)/net.h $(SRC)/phys_jj.h
806 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
808 +arp.o: $(SRC)/arp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h
809 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
810 +netinit.o: $(SRC)/netinit.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h $(SRC)/ip.h $(SRC)/udp.h
811 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
812 +tftp.o: $(SRC)/tftp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/arpa.h $(SRC)/romlib.h $(SRC)/tftp.h
813 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
814 +udp.o: $(SRC)/udp.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h $(SRC)/arp.h $(SRC)/ip.h $(SRC)/udp.h
815 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
816 +packet.o: $(SRC)/packet.c $(SRC)/general.h $(SRC)/net.h $(SRC)/romlib.h $(SRC)/netpriv.h
817 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
818 +sched_4m.o: $(SRC)/sched_4m.c $(SRC)/system.h $(SRC)/general.h $(SRC)/romlib.h $(SRC)/phys_jj.h
819 + $(CROSSCC) $(CFLAGS) -c $(SRC)/$*.c
820 +bootp.o: $(SRC)/bootp.c $(SRC)/general.h $(SRC)/net.h \
821 + $(SRC)/arpa.h $(SRC)/romlib.h $(SRC)/system.h $(SRC)/bootp.h
822 + $(CROSSCC) $(CFLAGS) -DNOBPEXT=1 -c $(SRC)/$*.c
825 + $(CROSSCC) $(ASFLAGS) -o $*.o -c $(SRC)/$*.S
827 + $(CROSSCC) $(ASFLAGS) -o $*.o -c $(SRC)/$*.S
833 +# $(CC) -o genlab genlab.o
837 + $(RM) $(PROLLEXE) proll.aout
839 +proll.aout: $(PROLLEXE)
840 + $(ELFTOAOUT) -o proll.aout $(PROLLEXE)
841 diff -ruN proll_18.orig/qemu/openprom.c proll-patch4/qemu/openprom.c
842 --- proll_18.orig/qemu/openprom.c 1970-01-01 00:00:00.000000000 +0000
843 +++ proll-patch4/qemu/openprom.c 2004-11-23 19:14:05.000000000 +0000
846 + * PROM interface support
847 + * Copyright 1996 The Australian National University.
848 + * Copyright 1996 Fujitsu Laboratories Limited
849 + * Copyright 1999 Pete A. Zaitcev
850 + * This software may be distributed under the terms of the Gnu
851 + * Public License version 2 or later
854 +#include <openprom.h>
855 +#include <general.h>
858 +#include <vconsole.h>
859 +#include "phys_jj.h"
868 + const struct property *properties;
869 + /* short */ const int sibling;
870 + /* short */ const int child;
873 +static int obp_nextnode(int node);
874 +static int obp_child(int node);
875 +static int obp_proplen(int node, char *name);
876 +static int obp_getprop(int node, char *name, char *val);
877 +static int obp_setprop(int node, char *name, char *val, int len);
878 +static const char *obp_nextprop(int node, char *name);
880 +static char obp_idprom[IDPROM_SIZE];
881 +static const struct property null_properties = { NULL, NULL, -1 };
882 +static const int prop_true = -1;
884 +static const struct property propv_root[] = {
885 + {"name", "SUNW,JavaStation-1", sizeof("SUNW,JavaStation-1") },
886 + {"idprom", obp_idprom, IDPROM_SIZE},
887 + {"banner-name", "JavaStation", sizeof("JavaStation")},
888 + {"compatible", "sun4m", 6},
892 +static const int prop_iommu_reg[] = {
893 + 0x0, 0x10000000, 0x00000300,
895 +static const struct property propv_iommu[] = {
896 + {"name", "iommu", sizeof("iommu")},
897 + {"reg", (char*)&prop_iommu_reg[0], sizeof(prop_iommu_reg) },
901 +static const int prop_sbus_ranges[] = {
902 + 0x0, 0x0, 0x0, 0x30000000, 0x10000000,
903 + 0x1, 0x0, 0x0, 0x40000000, 0x10000000,
904 + 0x2, 0x0, 0x0, 0x50000000, 0x10000000,
905 + 0x3, 0x0, 0x0, 0x60000000, 0x10000000,
906 + 0x4, 0x0, 0x0, 0x70000000, 0x10000000,
908 +static const struct property propv_sbus[] = {
909 + {"name", "sbus", 5},
910 + {"ranges", (char*)&prop_sbus_ranges[0], sizeof(prop_sbus_ranges)},
914 +static const int prop_tcx_regs[] = {
915 + 0x2, 0x00800000, 0x00100000,
916 + 0x2, 0x02000000, 0x00000001,
917 + 0x2, 0x04000000, 0x00800000,
918 + 0x2, 0x06000000, 0x00800000,
919 + 0x2, 0x0a000000, 0x00000001,
920 + 0x2, 0x0c000000, 0x00000001,
921 + 0x2, 0x0e000000, 0x00000001,
922 + 0x2, 0x00700000, 0x00001000,
923 + 0x2, 0x00200000, 0x00000004,
924 + 0x2, 0x00300000, 0x0000081c,
925 + 0x2, 0x00000000, 0x00010000,
926 + 0x2, 0x00240000, 0x00000004,
927 + 0x2, 0x00280000, 0x00000001,
931 +static const int pixfreq = 0x03dfd240;
932 +static const int hbporch = 0xa0;
933 +static const int vfreq = 0x3c;
935 +#if 0 /* Kevin Boone - 70Hz refresh */
936 +static const int pixfreq = 0x047868C0;
937 +static const int hbporch = 0x90;
938 +static const int vfreq = 0x46;
941 +static const int vbporch = 0x1d;
942 +static const int vsync = 0x6;
943 +static const int hsync = 0x88;
944 +static const int vfporch = 0x3;
945 +static const int hfporch = 0x18;
946 +static const int height = 0x300;
947 +static const int width = 0x400;
948 +static const int linebytes = 0x400;
949 +static const int depth = 8;
950 +static const int tcx_intr[] = { 5, 0 };
951 +static const int tcx_interrupts = 5;
952 +static const struct property propv_sbus_tcx[] = {
953 + {"name", "SUNW,tcx", sizeof("SUNW,tcx")},
954 + {"vbporch", (char*)&vbporch, sizeof(int)},
955 + {"hbporch", (char*)&hbporch, sizeof(int)},
956 + {"vsync", (char*)&vsync, sizeof(int)},
957 + {"hsync", (char*)&hsync, sizeof(int)},
958 + {"vfporch", (char*)&vfporch, sizeof(int)},
959 + {"hfporch", (char*)&hfporch, sizeof(int)},
960 + {"pixfreq", (char*)&pixfreq, sizeof(int)},
961 + {"vfreq", (char*)&vfreq, sizeof(int)},
962 + {"height", (char*)&height, sizeof(int)},
963 + {"width", (char*)&width, sizeof(int)},
964 + {"linebytes", (char*)&linebytes, sizeof(int)},
965 + {"depth", (char*)&depth, sizeof(int)},
966 + {"reg", (char*)&prop_tcx_regs[0], sizeof(prop_tcx_regs)},
967 + {"tcx-8-bit", (char*)&prop_true, 0},
968 + {"intr", (char*)&tcx_intr[0], sizeof(tcx_intr)},
969 + {"interrupts", (char*)&tcx_interrupts, sizeof(tcx_interrupts)},
970 + {"device_type", "display", sizeof("display")},
974 +static const int prop_cs4231_reg[] = {
975 + 0x3, 0x0C000000, 0x00000040
977 +static const int cs4231_interrupts = 5;
978 +static const int cs4231_intr[] = { 5, 0 };
980 +static const struct property propv_sbus_cs4231[] = {
981 + {"name", "SUNW,CS4231", sizeof("SUNW,CS4231") },
982 + {"intr", (char*)&cs4231_intr[0], sizeof(cs4231_intr) },
983 + {"interrupts", (char*)&cs4231_interrupts, sizeof(cs4231_interrupts) },
984 + {"reg", (char*)&prop_cs4231_reg[0], sizeof(prop_cs4231_reg) },
985 + {"device_type", "serial", sizeof("serial") },
986 + {"alias", "audio", sizeof("audio") },
990 +static const int cpu_nctx = NCTX_SWIFT;
991 +static const int cpu_cache_line_size = 0x20;
992 +static const int cpu_cache_nlines = 0x200;
993 +static const struct property propv_cpu[] = {
994 + {"name", "STP1012PGA", sizeof("STP1012PGA") },
995 + {"device_type", "cpu", 4 },
996 + {"mmu-nctx", (char*)&cpu_nctx, sizeof(int)},
997 + {"cache-line-size", (char*)&cpu_cache_line_size, sizeof(int)},
998 + {"cache-nlines", (char*)&cpu_cache_nlines, sizeof(int)},
1002 +static const int prop_obio_ranges[] = {
1003 + 0x0, 0x0, 0x0, 0x71000000, 0x01000000,
1005 +static const struct property propv_obio[] = {
1006 + {"name", "obio", 5 },
1007 + {"ranges", (char*)&prop_obio_ranges[0], sizeof(prop_obio_ranges) },
1011 +static const int prop_auxio_reg[] = {
1012 + 0x0, 0x00900000, 0x00000001,
1014 +static const struct property propv_obio_auxio[] = {
1015 + {"name", "auxio", sizeof("auxio") },
1016 + {"reg", (char*)&prop_auxio_reg[0], sizeof(prop_auxio_reg) },
1020 +static const int prop_int_reg[] = {
1021 + 0x0, 0x00e00000, 0x00000010,
1022 + 0x0, 0x00e10000, 0x00000010,
1024 +static const struct property propv_obio_int[] = {
1025 + {"name", "interrupt", sizeof("interrupt")},
1026 + {"reg", (char*)&prop_int_reg[0], sizeof(prop_int_reg) },
1030 +static const int prop_cnt_reg[] = {
1031 + 0x0, 0x00d00000, 0x00000010,
1032 + 0x0, 0x00d10000, 0x00000010,
1034 +static const struct property propv_obio_cnt[] = {
1035 + {"name", "counter", sizeof("counter")},
1036 + {"reg", (char*)&prop_cnt_reg[0], sizeof(prop_cnt_reg) },
1040 +static const int prop_eeprom_reg[] = {
1041 + 0x0, 0x00200000, 0x00002000,
1043 +static const struct property propv_obio_eep[] = {
1044 + {"name", "eeprom", sizeof("eeprom")},
1045 + {"reg", (char*)&prop_eeprom_reg[0], sizeof(prop_eeprom_reg) },
1046 + {"model", "mk48t08", sizeof("mk48t08")},
1050 +static const int prop_su_reg[] = {
1051 + 0x0, 0x003002f8, 0x00000008,
1053 +static const struct property propv_obio_su[] = {
1054 + {"name", "su", sizeof("su")},
1055 + {"reg", (char*)&prop_su_reg[0], sizeof(prop_su_reg) },
1059 +static const int prop_zs_intr[] = { 0x26, 0x0 };
1060 +static const int prop_zs_reg[] = {
1061 + 0x4, 0x00000000, 0x0000000f,
1063 +static const int prop_zs_slave[] = { 0x1 };
1064 +static const struct property propv_obio_zs[] = {
1065 + {"name", "zs", sizeof("zs")},
1066 + {"reg", (char*)&prop_zs_reg[0], sizeof(prop_zs_reg) },
1067 + {"reg", (char*)&prop_zs_slave[0], sizeof(prop_zs_slave) },
1068 + {"device_type", "serial", sizeof("serial") },
1072 +static const int prop_zs1_intr[] = { 0x26, 0x0 };
1073 +static const int prop_zs1_reg[] = {
1074 + 0x4, 0x00100000, 0x0000000f,
1076 +static const int prop_zs1_slave[] = { 0x0 };
1077 +static const struct property propv_obio_zs1[] = {
1078 + {"name", "zs", sizeof("zs")},
1079 + {"reg", (char*)&prop_zs1_reg[0], sizeof(prop_zs1_reg) },
1080 + {"reg", (char*)&prop_zs1_slave[0], sizeof(prop_zs1_slave) },
1081 + {"device_type", "serial", sizeof("serial") },
1085 +static const int prop_ledma_reg[] = {
1086 + 0x4, 0x08400010, 0x00000020,
1088 +static const int prop_ledma_burst = 0x3f;
1089 +static const struct property propv_sbus_ledma[] = {
1090 + {"name", "ledma", sizeof("ledma")},
1091 + {"reg", (char*)&prop_ledma_reg[0], sizeof(prop_ledma_reg) },
1092 + {"burst-sizes", (char*)&prop_ledma_burst, sizeof(int) },
1096 +static const int prop_le_reg[] = {
1097 + 0x4, 0x08c00000, 0x00000004,
1099 +static const int prop_le_busmaster_regval = 0x7;
1100 +static const int prop_le_intr[] = { 0x26, 0x0 };
1101 +static const struct property propv_sbus_ledma_le[] = {
1102 + {"name", "le", sizeof("le")},
1103 + {"reg", (char*)&prop_le_reg[0], sizeof(prop_le_reg) },
1104 + {"busmaster-regval", (char*)&prop_le_busmaster_regval, sizeof(int)},
1105 + {"intr", (char*)&prop_le_intr[0], sizeof(prop_le_intr) },
1109 +static const struct node nodes[] = {
1110 + { &null_properties, 1, 0 }, /* 0 = big brother of root */
1111 + { propv_root, 0, 2 }, /* 1 "/" */
1112 + { propv_iommu, 8, 3 }, /* 2 "/iommu" */
1113 + { propv_sbus, 0, 4 }, /* 3 "/iommu/sbus" */
1114 + { propv_sbus_tcx, 5, 0 }, /* 4 "/iommu/sbus/SUNW,tcx" */
1115 + { propv_sbus_ledma, 7, 6 }, /* 5 "/iommu/sbus/ledma" */
1116 + { propv_sbus_ledma_le, 0, 0 }, /* 6 "/iommu/sbus/ledma/le" */
1117 + { propv_sbus_cs4231, 0, 0 }, /* 7 "/iommu/sbus/SUNW,CS4231 */
1118 + { propv_cpu, 9, 0 }, /* 8 "/STP1012PGA" */
1119 + { propv_obio, 0, 10 }, /* 9 "/obio" */
1120 + { propv_obio_int, 11, 0 }, /* 10 "/obio/interrupt" */
1121 + { propv_obio_cnt, 12, 0 }, /* 11 "/obio/counter" */
1122 + { propv_obio_eep, 13, 0 }, /* 12 "/obio/eeprom" */
1123 + { propv_obio_su, 14, 0 }, /* 13 "/obio/su" */
1124 + { propv_obio_auxio, 0, 0 }, /* 14 "/obio/auxio" */
1125 + { propv_obio_zs, 0, 0 }, /* 14 "/obio/zs@0,0" */
1126 + { propv_obio_zs1, 0, 0 }, /* 14 "/obio/zs@0,100000" */
1129 +static struct linux_mlist_v0 totphys[MAX_BANKS];
1130 +static struct linux_mlist_v0 totmap[1];
1131 +static struct linux_mlist_v0 totavail[MAX_BANKS];
1133 +static struct linux_mlist_v0 *ptphys;
1134 +static struct linux_mlist_v0 *ptmap;
1135 +static struct linux_mlist_v0 *ptavail;
1137 +static const struct linux_nodeops nodeops0 = {
1138 + obp_nextnode, /* int (*no_nextnode)(int node); */
1139 + obp_child, /* int (*no_child)(int node); */
1140 + obp_proplen, /* int (*no_proplen)(int node, char *name); */
1141 + obp_getprop, /* int (*no_getprop)(int node,char *name,char *val); */
1142 + obp_setprop, /* int (*no_setprop)(int node, char *name,
1143 + char *val, int len); */
1144 + obp_nextprop /* char * (*no_nextprop)(int node, char *name); */
1147 +static const char arg_nfsroot[] = "console=ttyS0 ip=bootp root=nfs";
1149 +static const struct linux_arguments_v0 obp_arg = {
1150 + { "le()", arg_nfsroot, NULL, NULL, NULL, NULL, NULL, NULL },
1152 + { 'l', 'e' }, 0, 0, 0, NULL,
1155 +static const struct linux_arguments_v0 * const obp_argp = &obp_arg;
1157 +static const void * const synch_hook = NULL;
1159 +static const char obp_stdin = PROMDEV_KBD;
1160 +static const char obp_stdout = PROMDEV_SCREEN;
1162 +static const char obp_stdin = PROMDEV_TTYA;
1163 +static const char obp_stdout = PROMDEV_TTYA;
1166 +static int obp_nbgetchar(void);
1167 +static int obp_nbputchar(int ch);
1168 +static void obp_reboot(char *);
1169 +static void obp_abort(void);
1170 +static void obp_halt(void);
1171 +static int obp_devopen(char *str);
1172 +static int obp_devclose(int dev_desc);
1173 +static int obp_rdblkdev(int dev_desc, int num_blks, int blk_st, char *buf);
1175 +static void doublewalk(unsigned ptab1, unsigned va)
1177 +unsigned int proc_tablewalk(int ctx, unsigned int va);
1178 +unsigned int mem_tablewalk(unsigned int pa, unsigned int va);
1180 + proc_tablewalk(0, va);
1181 + if (ptab1 != 0) mem_tablewalk(ptab1, va);
1185 +static const struct linux_romvec romvec0 = {
1186 + LINUX_OPPROM_MAGIC, /* pv_magic_cookie */
1187 + 0, /* pv_romvers - Format selector! */
1188 + 77, /* pv_plugin_revision */
1189 + 0x10203, /* pv_printrev */
1191 + &ptphys, /* v0_totphys */
1192 + &ptmap, /* v0_prommap */
1193 + &ptavail /* v0_available */
1195 + &nodeops0, /* struct linux_nodeops *pv_nodeops; */
1196 + (void*)doublewalk, /* P3 */ /* char **pv_bootstr; */
1197 + { /* struct linux_dev_v0_funcs pv_v0devops; */
1198 + &obp_devopen, /* v0_devopen */
1199 + &obp_devclose, /* v0_devclose */
1200 + &obp_rdblkdev, /* v0_rdblkdev */
1201 + NULL, /* v0_wrblkdev */
1202 + NULL, /* v0_wrnetdev */
1203 + NULL, /* v0_rdnetdev */
1204 + NULL, /* v0_rdchardev */
1205 + NULL, /* v0_wrchardev */
1206 + NULL /* v0_seekdev */
1208 + &obp_stdin, /* char *pv_stdin */
1209 + &obp_stdout, /* char *pv_stdout; */
1210 + obp_nbgetchar, /* int (*pv_getchar)(void); */
1211 + obp_nbputchar, /* void (*pv_putchar)(int ch); */
1212 + obp_nbgetchar, /* int (*pv_nbgetchar)(void); */
1213 + obp_nbputchar, /* int (*pv_nbputchar)(int ch); */
1214 + NULL, /* void (*pv_putstr)(char *str, int len); */
1215 + obp_reboot, /* void (*pv_reboot)(char *bootstr); */
1216 + NULL, /* void (*pv_printf)(__const__ char *fmt, ...); */
1217 + obp_abort, /* void (*pv_abort)(void); */
1218 + NULL, /* __volatile__ int *pv_ticks; */
1219 + obp_halt, /* void (*pv_halt)(void); */
1220 + (void *)&synch_hook, /* void (**pv_synchook)(void); */
1223 + /* Evaluate a forth string, not different proto for V0 and V2->up. */
1225 + void (*v0_eval)(int len, char *str);
1226 + void (*v2_eval)(char *str);
1229 + { 0 }, /* pv_fortheval */
1231 + &obp_argp, /* struct linux_arguments_v0 **pv_v0bootargs; */
1232 + NULL, /* pv_enaddr */
1233 + { /* pv_v2bootargs */
1234 + NULL, /* char **bootpath; */
1235 + NULL, /* char **bootargs; */
1236 + NULL, /* fd_stdin; */
1237 + NULL, /* fd_stdout */
1239 + { /* pv_v2devops */
1240 + NULL, /* v2_inst2pkg */
1241 + NULL, /* v2_dumb_mem_alloc */
1242 + NULL, /* v2_dumb_mem_free */
1243 + NULL, /* v2_dumb_mmap */
1244 + NULL, /* v2_dumb_munmap */
1245 + NULL, /* v2_dev_open */
1246 + NULL, /* v2_dev_close */
1247 + NULL, /* v2_dev_read */
1248 + NULL, /* v2_dev_write */
1249 + NULL, /* v2_dev_seek */
1250 + NULL, /* v2_wheee2 */
1251 + NULL, /* v2_wheee3 */
1253 + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* filler[15] */
1254 + NULL, /* pv_setctxt */
1255 + NULL, /* v3_cpustart */
1256 + NULL, /* v3_cpustop */
1257 + NULL, /* v3_cpuidle */
1258 + NULL /* v3_cpuresume */
1262 +static struct linux_romvec romvec0;
1265 +init_openprom(int bankc, struct bank *bankv, unsigned hiphybas)
1270 + * Avoid data segment allocations
1274 + ptavail = totavail;
1276 + * Form memory descriptors.
1278 + for (i = 0; i < bankc; i++) {
1279 + totphys[i].theres_more = &totphys[i+1];
1280 + totphys[i].start_adr = (char*) bankv[i].start;
1281 + totphys[i].num_bytes = bankv[i].length;
1283 + totphys[i-1].theres_more = 0;
1286 + * XXX Merged in normal PROM when full banks touch.
1288 + for (i = 0; i < bankc; i++) {
1289 + unsigned bankbase = bankv[i].start;
1290 + unsigned banksize = bankv[i].length;
1291 + if (hiphybas > bankbase &&
1292 + hiphybas < bankbase + banksize) {
1293 + banksize = hiphybas - bankbase;
1295 + totavail[i].theres_more = &totavail[i+1];
1296 + totavail[i].start_adr = (char*) bankbase;
1297 + totavail[i].num_bytes = banksize;
1299 + totavail[i-1].theres_more = 0;
1301 + totmap[0].theres_more = 0;
1302 + totmap[0].start_adr = (char*) PROLBASE;
1303 + totmap[0].num_bytes = PROLSIZE;
1308 + bcopy(idprom, obp_idprom, IDPROM_SIZE);
1310 + // Linux wants a R/W romvec table
1311 + romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC;
1312 + romvec0.pv_plugin_revision = 77;
1313 + romvec0.pv_printrev = 0x10203;
1314 + romvec0.pv_v0mem.v0_totphys = &ptphys;
1315 + romvec0.pv_v0mem.v0_prommap = &ptmap;
1316 + romvec0.pv_v0mem.v0_available = &ptavail;
1317 + romvec0.pv_nodeops = &nodeops0;
1318 + romvec0.pv_bootstr = (void *)doublewalk;
1319 + romvec0.pv_stdin = &obp_stdin;
1320 + romvec0.pv_stdout = &obp_stdout;
1321 + romvec0.pv_getchar = obp_nbgetchar;
1322 + romvec0.pv_putchar = obp_nbputchar;
1323 + romvec0.pv_nbgetchar = obp_nbgetchar;
1324 + romvec0.pv_nbputchar = obp_nbputchar;
1325 + romvec0.pv_reboot = obp_reboot;
1326 + romvec0.pv_abort = obp_abort;
1327 + romvec0.pv_halt = obp_halt;
1328 + romvec0.pv_synchook = &synch_hook;
1329 + romvec0.pv_v0bootargs = &obp_argp;
1333 +static const struct property *find_property(int node,char *name)
1335 + const struct property *prop = &nodes[node].properties[0];
1336 + while (prop && prop->name) {
1337 + if (bcmp(prop->name, name, 128) == 0) return prop;
1343 +static int obp_nextnode(int node)
1345 + return nodes[node].sibling;
1348 +static int obp_child(int node)
1350 + return nodes[node].child;
1353 +static int obp_proplen(int node, char *name)
1355 + const struct property *prop = find_property(node,name);
1356 + if (prop) return prop->length;
1360 +static int obp_getprop(int node, char *name, char *value)
1362 + const struct property *prop;
1364 + prop = find_property(node,name);
1366 + memcpy(value,prop->value,prop->length);
1367 + //printk("obp_getprop '%s'= %s\n", name, value);
1368 + return prop->length;
1370 + //printk("obp_getprop: not found\n");
1374 +static int obp_setprop(int node, char *name, char *value, int len)
1379 +static const char *obp_nextprop(int node,char *name)
1381 + const struct property *prop = find_property(node,name);
1382 + if (prop) return prop[1].name;
1387 +static unsigned char calc_idprom_cksum(struct idprom *idprom)
1389 + unsigned char cksum, i, *ptr = (unsigned char *)idprom;
1391 + for (i = cksum = 0; i <= 0x0E; i++)
1398 +static int obp_nbgetchar(void) {
1402 +static int obp_nbputchar(int ch) {
1403 + extern struct vconterm dp0;
1406 + /* We do not use printk() in order to reduce stack depth. */
1407 + vcon_write(&dp0, &buf, 1);
1411 +static void obp_reboot(char *str) {
1412 + printk("rebooting (%s): not implemented, freezing\n", str);
1416 +static void obp_abort() {
1417 + printk("abort, freezing\n");
1421 +static void obp_halt() {
1422 + printk("halt, freezing\n");
1426 +static int obp_devopen(char *str) {
1427 + //printk("open %s\n", str);
1431 +static int obp_devclose(int dev_desc) {
1432 + //printk("close %d\n", dev_desc);
1436 +static int obp_rdblkdev(int dev_desc, int num_blks, int blk_st, char *buf) {
1437 + //printk("rdblkdev: fd %d, num_blks %d, blk_st %d, buf 0x%x\n", dev_desc, num_blks, blk_st, buf);
1441 diff -ruN proll_18.orig/src/arp.c proll-patch4/src/arp.c
1442 --- proll_18.orig/src/arp.c 2001-12-24 05:12:31.000000000 +0000
1443 +++ proll-patch4/src/arp.c 2004-11-13 15:50:49.000000000 +0000
1446 static struct arp_cache arp_list[ARPNUM]; /* ARP address cache */
1447 static int next_arp; /* next table entry */
1448 -static t_ipaddr def_gw = IP_ANY; /* default routing */
1449 +static t_ipaddr def_gw; /* default routing */
1455 * Resolve IP address and return pointer to hardware address.
1457 -unsigned char *ip_resolve(ip)
1458 +const unsigned char *ip_resolve(ip)
1462 @@ -230,14 +230,11 @@
1466 - /* Set name of module for error messages */
1467 - net_module_name = "arp";
1470 /* Register ARP packet type and set send buffer pointer */
1471 if ((arpbuf = (struct arphdr *)reg_type(htons(ETH_P_ARP), arp_recv)) == NULL)
1478 diff -ruN proll_18.orig/src/arp.h proll-patch4/src/arp.h
1479 --- proll_18.orig/src/arp.h 1999-03-18 03:39:43.000000000 +0000
1480 +++ proll-patch4/src/arp.h 2004-11-13 15:50:49.000000000 +0000
1482 extern int init_arp __P((void));
1484 /* Resolve IP address and return pointer to hardware address */
1485 -extern unsigned char *ip_resolve __P((t_ipaddr ip));
1486 +extern const unsigned char *ip_resolve __P((t_ipaddr ip));
1488 /* Add a new antry to the ARP cache */
1489 extern void addcache __P((unsigned char *ha, t_ipaddr ip));
1490 diff -ruN proll_18.orig/src/hconsole.c proll-patch4/src/hconsole.c
1491 --- proll_18.orig/src/hconsole.c 2002-07-23 05:52:48.000000000 +0000
1492 +++ proll-patch4/src/hconsole.c 2004-11-13 15:50:49.000000000 +0000
1494 * No probing sequence or argument passing, hardcode everything. XXX
1496 raster8_cons_a(q, 768, 1024, (char *)a0);
1498 raster_cons_2(r, q, 768-(24*11)-1, 1024-(8*80)-1, (24*11), (8*80));
1500 + raster_cons_2(r, q, 0, 0, 768, 1024);
1505 diff -ruN proll_18.orig/src/lat7_2.bm proll-patch4/src/lat7_2.bm
1506 --- proll_18.orig/src/lat7_2.bm 1999-02-27 05:48:54.000000000 +0000
1507 +++ proll-patch4/src/lat7_2.bm 2004-11-13 15:50:49.000000000 +0000
1509 #define lat7_2_width 128
1510 #define lat7_2_height 88
1511 -static unsigned char lat7_2_bits[] = {
1512 +static unsigned const char lat7_2_bits[] = {
1513 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1514 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x12, 0x1e, 0x0c, 0x02, 0x70, 0x18,
1515 0x22, 0x22, 0x18, 0x00, 0x00, 0x18, 0x18, 0xff, 0x18, 0x00, 0x12, 0x02,
1516 diff -ruN proll_18.orig/src/lat7_2_swapped.bm proll-patch4/src/lat7_2_swapped.bm
1517 --- proll_18.orig/src/lat7_2_swapped.bm 1970-01-01 00:00:00.000000000 +0000
1518 +++ proll-patch4/src/lat7_2_swapped.bm 2004-11-13 15:50:49.000000000 +0000
1520 +#define lat7_2_width 128
1521 +#define lat7_2_height 88
1522 +static unsigned const char lat7_2_bits[] = {
1523 + 0x00, 0x00, 0x18, 0x3c, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
1524 + 0x55, 0x00, 0x2a, 0x00, 0x55, 0x00, 0x2a, 0x00, 0x55, 0x00, 0x00, 0x48,
1525 + 0x48, 0x78, 0x48, 0x5f, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x78, 0x40,
1526 + 0x70, 0x40, 0x4f, 0x08, 0x0e, 0x08, 0x08, 0x00, 0x00, 0x30, 0x40, 0x40,
1527 + 0x40, 0x3e, 0x09, 0x0e, 0x0a, 0x09, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40,
1528 + 0x7f, 0x08, 0x0e, 0x08, 0x08, 0x00, 0x00, 0x0e, 0x0a, 0x0e, 0x00, 0x00,
1529 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00,
1530 + 0x7e, 0x00, 0x00, 0x00, 0x00, 0x44, 0x64, 0x54, 0x4c, 0x54, 0x10, 0x10,
1531 + 0x10, 0x1f, 0x00, 0x00, 0x44, 0x44, 0x44, 0x28, 0x1f, 0x04, 0x04, 0x04,
1532 + 0x04, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00,
1533 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x00,
1534 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00,
1535 + 0x18, 0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
1536 + 0x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0xff, 0x00,
1537 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
1538 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1539 + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1540 + 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1541 + 0x00, 0x00, 0xff, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18,
1542 + 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18,
1543 + 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0x00, 0x00, 0x00,
1544 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x00,
1545 + 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00,
1546 + 0x06, 0x0c, 0x18, 0x30, 0x18, 0x6c, 0x36, 0x18, 0x0c, 0x00, 0x00, 0x60,
1547 + 0x30, 0x18, 0x0c, 0x18, 0x36, 0x6c, 0x18, 0x30, 0x00, 0x00, 0x7f, 0x36,
1548 + 0x36, 0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x7e,
1549 + 0x18, 0x7e, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0x30, 0x78,
1550 + 0x30, 0x72, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
1551 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,
1552 + 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1553 + 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x00,
1554 + 0x00, 0x00, 0x00, 0x66, 0x66, 0x22, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00,
1555 + 0x00, 0x00, 0x36, 0x7f, 0x36, 0x36, 0x36, 0x7f, 0x36, 0x00, 0x00, 0x00,
1556 + 0x00, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00,
1557 + 0x72, 0x56, 0x6c, 0x18, 0x36, 0x6a, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x18,
1558 + 0x24, 0x28, 0x30, 0x4a, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
1559 + 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x18,
1560 + 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x18, 0x18,
1561 + 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0x7e, 0x3c,
1562 + 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18,
1563 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
1564 + 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
1565 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
1566 + 0x00, 0x00, 0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x40, 0x00, 0x00, 0x00,
1567 + 0x00, 0x3c, 0x46, 0x4e, 0x5a, 0x72, 0x62, 0x3c, 0x00, 0x00, 0x00, 0x00,
1568 + 0x18, 0x38, 0x58, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x3c,
1569 + 0x66, 0x06, 0x0c, 0x18, 0x32, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
1570 + 0x06, 0x1c, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30,
1571 + 0x66, 0x7e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x60, 0x7c, 0x66,
1572 + 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x60, 0x7c, 0x66, 0x66,
1573 + 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x46, 0x06, 0x0c, 0x18, 0x30,
1574 + 0x30, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x3c,
1575 + 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x3c, 0x00,
1576 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00,
1577 + 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x08, 0x10, 0x00,
1578 + 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00,
1579 + 0x00, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
1580 + 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
1581 + 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x5e,
1582 + 0x56, 0x5e, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66, 0x66,
1583 + 0x7e, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x66,
1584 + 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x60, 0x60, 0x60, 0x66,
1585 + 0x3c, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c,
1586 + 0x00, 0x00, 0x00, 0x00, 0x7e, 0x62, 0x60, 0x78, 0x60, 0x62, 0x7e, 0x00,
1587 + 0x00, 0x00, 0x00, 0x7e, 0x62, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00, 0x00,
1588 + 0x00, 0x00, 0x3c, 0x66, 0x60, 0x6e, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00,
1589 + 0x00, 0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
1590 + 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x7e,
1591 + 0x46, 0x06, 0x06, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x66, 0x6c,
1592 + 0x78, 0x70, 0x78, 0x6c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60,
1593 + 0x60, 0x60, 0x62, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x41, 0x63, 0x77, 0x7f,
1594 + 0x6b, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x76, 0x7e, 0x6e,
1595 + 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66,
1596 + 0x3c, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60,
1597 + 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x6e, 0x3c, 0x02,
1598 + 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x00, 0x00,
1599 + 0x00, 0x00, 0x3c, 0x66, 0x60, 0x3c, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00,
1600 + 0x00, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
1601 + 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x66,
1602 + 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x63, 0x63,
1603 + 0x63, 0x6b, 0x6b, 0x7f, 0x36, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x3c,
1604 + 0x18, 0x3c, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x3c,
1605 + 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x46, 0x0c, 0x18, 0x30,
1606 + 0x62, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30,
1607 + 0x3c, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x02,
1608 + 0x00, 0x00, 0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00,
1609 + 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1610 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00,
1611 + 0x00, 0x08, 0x10, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1612 + 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x60,
1613 + 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1614 + 0x3c, 0x66, 0x60, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06,
1615 + 0x3e, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
1616 + 0x7e, 0x60, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0x30, 0x30, 0x78,
1617 + 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66, 0x66,
1618 + 0x3e, 0x06, 0x3c, 0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66,
1619 + 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x1c, 0x00,
1620 + 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38,
1621 + 0x00, 0x00, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x7c, 0x66, 0x00, 0x00, 0x00,
1622 + 0x00, 0x60, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
1623 + 0x00, 0x00, 0x76, 0x7f, 0x6b, 0x6b, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00,
1624 + 0x00, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1625 + 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
1626 + 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66,
1627 + 0x66, 0x66, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x72, 0x60,
1628 + 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x60, 0x3c, 0x06,
1629 + 0x3c, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x78, 0x30, 0x30, 0x36, 0x1c,
1630 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3a, 0x00,
1631 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00,
1632 + 0x00, 0x00, 0x00, 0x00, 0x63, 0x6b, 0x6b, 0x6b, 0x36, 0x00, 0x00, 0x00,
1633 + 0x00, 0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00,
1634 + 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x3c, 0x00, 0x00, 0x00,
1635 + 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18,
1636 + 0x18, 0x30, 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18,
1637 + 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x30, 0x18, 0x18, 0x0c,
1638 + 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0x00, 0x00, 0x00,
1639 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x00, 0x00, 0x00, 0x00,
1640 + 0x00, 0x00, 0x00, 0x00};
1641 diff -ruN proll_18.orig/src/le.c proll-patch4/src/le.c
1642 --- proll_18.orig/src/le.c 2002-07-23 05:52:49.000000000 +0000
1643 +++ proll-patch4/src/le.c 2004-11-13 15:50:49.000000000 +0000
1645 unsigned short rap; /* register address port */
1648 -int sparc_lance_debug = 2;
1650 /* The Lance uses 24 bit addresses */
1651 /* On the Sun4c the DVMA will provide the remaining bytes for us */
1652 /* On the Sun4m we have to instruct the ledma to provide them */
1653 diff -ruN proll_18.orig/src/netinit.c proll-patch4/src/netinit.c
1654 --- proll_18.orig/src/netinit.c 2002-09-13 21:53:33.000000000 +0000
1655 +++ proll-patch4/src/netinit.c 2004-11-13 15:50:49.000000000 +0000
1657 unsigned char myhwaddr[ETH_ALEN]; /* my own hardware addr */
1658 t_ipaddr myipaddr; /* my own IP address */
1659 t_ipaddr mynetmask; /* my own netmask */
1660 - char *net_module_name; /* name of init module */
1661 t_ipaddr servaddr; /* IP of RARP&TFTP server */
1663 /* Broadcast hardware address */
1664 -unsigned char bcasthw[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
1665 +const unsigned char bcasthw[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
1670 +/* This is taken from x86 to be used in network kernel. Returns 15 bits. */
1673 + seed = (seed + 23968)*0x015A4E35 >> 1;
1674 + return seed & 0x7FFF;
1678 **************************************************************************
1679 @@ -104,10 +111,17 @@
1683 + /* Avoid data segment allocations */
1686 /* Initialize the different network layer modules */
1688 - if (!init_arp() || !init_udp()) {
1689 - printf("\nERROR: init_%s\n", net_module_name);
1690 + if (!init_arp()) {
1691 + printf("\nERROR: init_arp\n");
1694 + if (!init_udp()) {
1695 + printf("\nERROR: init_udp\n");
1699 diff -ruN proll_18.orig/src/netpriv.h proll-patch4/src/netpriv.h
1700 --- proll_18.orig/src/netpriv.h 1999-04-27 05:39:37.000000000 +0000
1701 +++ proll-patch4/src/netpriv.h 2004-11-13 15:50:49.000000000 +0000
1702 @@ -130,10 +130,9 @@
1705 extern unsigned char myhwaddr[ETH_ALEN]; /* my own hardware address */
1706 -extern unsigned char bcasthw[ETH_ALEN]; /* broadcast hardware addr */
1707 +extern const unsigned char bcasthw[ETH_ALEN]; /* broadcast hardware addr */
1708 extern t_ipaddr myipaddr; /* my own IP address */
1709 extern t_ipaddr mynetmask; /* netmask for my network */
1710 -extern char *net_module_name; /* initialized module's name */
1711 extern t_ipaddr servaddr; /* server IP address */
1715 extern unsigned char *reg_type __P((int typeval, int (* receive)()));
1717 /* Write a packet to the network */
1718 -extern int write_packet __P((int bufsize, int typeval, unsigned char *addr));
1719 +extern int write_packet __P((int bufsize, int typeval, const unsigned char *addr));
1721 /* Empty read buffer */
1722 extern void empty_buf __P((void));
1723 diff -ruN proll_18.orig/src/openprom.h proll-patch4/src/openprom.h
1724 --- proll_18.orig/src/openprom.h 2002-07-14 02:26:30.000000000 +0000
1725 +++ proll-patch4/src/openprom.h 2004-11-13 15:50:49.000000000 +0000
1729 struct linux_mem_v0 {
1730 - struct linux_mlist_v0 **v0_totphys;
1731 - struct linux_mlist_v0 **v0_prommap;
1732 - struct linux_mlist_v0 **v0_available; /* What we can use */
1733 + struct linux_mlist_v0 * const *v0_totphys;
1734 + struct linux_mlist_v0 * const *v0_prommap;
1735 + struct linux_mlist_v0 * const *v0_available; /* What we can use */
1738 /* Arguments sent to the kernel from the boot prompt. */
1739 struct linux_arguments_v0 {
1741 + const char *argv[8];
1747 - char *kernel_file_name;
1748 + const char *kernel_file_name;
1749 void *aieee1; /* XXX */
1753 struct linux_mem_v0 pv_v0mem;
1755 /* Node operations. */
1756 - struct linux_nodeops *pv_nodeops;
1757 + const struct linux_nodeops *pv_nodeops;
1760 struct linux_dev_v0_funcs pv_v0devops;
1764 + const char *pv_stdin;
1765 + const char *pv_stdout;
1766 #define PROMDEV_KBD 0 /* input from keyboard */
1767 #define PROMDEV_SCREEN 0 /* output to screen */
1768 #define PROMDEV_TTYA 1 /* in/out to ttya */
1770 void (*v2_eval)(char *str);
1773 - struct linux_arguments_v0 **pv_v0bootargs;
1774 + const struct linux_arguments_v0 * const *pv_v0bootargs;
1776 /* Get ether address. */
1777 unsigned int (*pv_enaddr)(int d, char *enaddr);
1779 int (*no_proplen)(int node, char *name);
1780 int (*no_getprop)(int node, char *name, char *val);
1781 int (*no_setprop)(int node, char *name, char *val, int len);
1782 - char * (*no_nextprop)(int node, char *name);
1783 + const char * (*no_nextprop)(int node, char *name);
1786 /* More fun PROM structures for device probing. */
1787 diff -ruN proll_18.orig/src/packet.c proll-patch4/src/packet.c
1788 --- proll_18.orig/src/packet.c 2000-02-11 04:56:45.000000000 +0000
1789 +++ proll-patch4/src/packet.c 2004-11-13 15:50:49.000000000 +0000
1793 static struct sk_buff *rskb;
1794 -static int nqskb = 0;
1800 for (i = 0; i < MAXSKBS; i++) {
1801 skev[i].skb.allocn = i;
1807 unsigned char *reg_type(int ptype, int (*func)())
1812 -int write_packet(int leng, int type, unsigned char *dst)
1813 +int write_packet(int leng, int type, const unsigned char *dst)
1815 struct sk_buff *skb;
1817 diff -ruN proll_18.orig/src/printf.c proll-patch4/src/printf.c
1818 --- proll_18.orig/src/printf.c 1999-03-19 07:03:59.000000000 +0000
1819 +++ proll-patch4/src/printf.c 2004-11-13 15:50:49.000000000 +0000
1821 static void printn(struct prf_fp *, unsigned long, unsigned int);
1822 static void putchar(char, struct prf_fp *);
1824 -static char hextab[] = "0123456789ABCDEF";
1825 +static const char hextab[] = "0123456789ABCDEF";
1828 * Scaled down version of C Library printf.
1831 prf(struct prf_fp *filog, char *fmt, va_list adx)
1839 putchar(va_arg(adx,unsigned), filog);
1840 } else if(c == 's') {
1841 s = va_arg(adx,char*);
1845 } else if (c == 'l' || c == 'O') {
1846 printn(filog, (long)va_arg(adx,long), c=='l'?10:8);
1847 diff -ruN proll_18.orig/src/rconsole.c proll-patch4/src/rconsole.c
1848 --- proll_18.orig/src/rconsole.c 1999-01-16 07:16:55.000000000 +0000
1849 +++ proll-patch4/src/rconsole.c 2004-11-13 15:50:49.000000000 +0000
1851 * move to California. Only plain lat7 survived.
1852 * I recreated lat7-1 changes in lat7-2. --zaitcev
1855 #include "lat7_2.bm" /* lat7_1.bm */
1857 +#include "lat7_2_swapped.bm" /* lat7_1.bm */
1859 #define LAT7_NCHARS 128
1860 #define LAT7_HEIGHT 11
1861 #define LAT7_WIDTH 8
1864 static Rf_scan lat7_body[ LAT7_NCHARS*LAT7_HEIGHT ];
1874 static inline int swapbits(int w0)
1877 @@ -105,13 +112,16 @@
1883 void font_cons_7(struct rfont *p)
1891 for (x = 0; x < LAT7_NCHARS*LAT7_HEIGHT; x++ ) {
1892 lat7_body[ (erow * lat7_2_width/8 + col) * LAT7_HEIGHT + row ] =
1893 swapbits(lat7_2_bits[x]) & 0xFF;
1897 p->body_ = lat7_body;
1899 + p->body_ = lat7_2_bits;
1901 p->nchars_ = LAT7_NCHARS;
1902 p->width_ = LAT7_WIDTH;
1903 p->height_ = LAT7_HEIGHT;
1904 diff -ruN proll_18.orig/src/rconsole.h proll-patch4/src/rconsole.h
1905 --- proll_18.orig/src/rconsole.h 1999-01-16 05:00:59.000000000 +0000
1906 +++ proll-patch4/src/rconsole.h 2004-11-13 15:50:49.000000000 +0000
1910 #define RF_MAXWIDTH 16
1911 -typedef unsigned short Rf_scan; /* __w16 to be used */
1912 +typedef unsigned char Rf_scan; /* __w16 to be used */
1916 + const Rf_scan *body_;
1917 int nchars_; /* 128 for ASCII ... 65536 for Unicode */
1918 int width_; /* [Pixels]. Maximum size is 16. */
1919 int height_; /* [Pixels == scan lines]. */
1920 diff -ruN proll_18.orig/src/romlib.h proll-patch4/src/romlib.h
1921 --- proll_18.orig/src/romlib.h 1999-04-20 04:26:45.000000000 +0000
1922 +++ proll-patch4/src/romlib.h 2004-11-13 15:50:49.000000000 +0000
1924 #define memcpy(dst, src, len) bcopy(src, dst, len)
1925 #define memcmp(x1, x2, len) bcmp(x1, x2, len)
1926 #define memset(p, len, zero) bzero(p, len)
1927 -extern void bcopy(void *b1, void *b2, int length);
1928 -extern int bcmp(void *b1, void *b2, int length);
1929 +extern void bcopy(const void *b1, void *b2, int length);
1930 +extern int bcmp(const void *b1, const void *b2, int length);
1931 extern void bzero(void *b, int c);
1932 /* gcc complains about "conflicting types for builtin function strlen". */
1933 #define strlen(s) ssize(s)
1934 -extern int ssize(char *s);
1935 +extern int ssize(const char *s);
1939 diff -ruN proll_18.orig/src/sched_4m.c proll-patch4/src/sched_4m.c
1940 --- proll_18.orig/src/sched_4m.c 1999-04-27 05:48:51.000000000 +0000
1941 +++ proll-patch4/src/sched_4m.c 2004-11-13 15:50:49.000000000 +0000
1943 static int set_bolt; /* Tick counter limit */
1944 static struct handsc hndv[16];
1946 -static unsigned int intr_to_mask[16] = {
1947 +static unsigned const int intr_to_mask[16] = {
1948 0, 0, 0, 0, 0, 0, SUN4M_INT_ETHERNET, 0,
1949 0, 0, 0, 0, 0, 0, 0, 0,
1951 diff -ruN proll_18.orig/src/swap.c proll-patch4/src/swap.c
1952 --- proll_18.orig/src/swap.c 1970-01-01 00:00:00.000000000 +0000
1953 +++ proll-patch4/src/swap.c 2004-11-13 15:50:49.000000000 +0000
1955 +// Convert the lat7 font so that no conversion is needed at runtime.
1957 +#include "rconsole.c"
1969 + for (i = 0; i < LAT7_NCHARS*LAT7_HEIGHT; i++) {
1970 + printf("0x%02x, ", p.body_[i]);
1971 + if ((i % 12) == 11)
1976 diff -ruN proll_18.orig/src/system.c proll-patch4/src/system.c
1977 --- proll_18.orig/src/system.c 2002-07-23 05:52:49.000000000 +0000
1978 +++ proll-patch4/src/system.c 2004-11-13 15:50:49.000000000 +0000
1982 /* We need to start from LOADBASE, but kernel wants PAGE_SIZE. */
1984 - for (va = PAGE_SIZE; va < LOWMEMSZ; va += PAGE_SIZE) {
1986 + for (va = 0; va < LOWMEMSZ; va += PAGE_SIZE) {
1987 map_page(l1, va, pa, 0, highbase);
1990 @@ -518,12 +518,12 @@
1991 while (len--) *((char *)s)++ = 0;
1994 -void bcopy(void *f, void *t, int len) {
1995 +void bcopy(const void *f, void *t, int len) {
1996 while (len--) *((char *)t)++ = *((char *)f)++;
1999 /* Comparison is 7-bit */
2000 -int bcmp(void *s1, void *s2, int len)
2001 +int bcmp(const void *s1, const void *s2, int len)
2009 -int strlen(char *s) {
2011 +int strlen(const char *s) {
2013 for (p = s; *p != 0; p++) { }
2016 @@ -560,14 +560,6 @@
2020 -/* This is taken from x86 to be used in network kernel. Returns 15 bits. */
2023 - static unsigned int seed = 151;
2024 - seed = (seed + 23968)*0x015A4E35 >> 1;
2025 - return seed & 0x7FFF;
2031 diff -ruN proll_18.orig/src/system.h proll-patch4/src/system.h
2032 --- proll_18.orig/src/system.h 2002-09-13 21:53:32.000000000 +0000
2033 +++ proll-patch4/src/system.h 2004-11-13 15:50:49.000000000 +0000
2035 #define IOMAPSIZE (1*1024*1024) /* 1 Meg maximum: we do not map framebuffer. */
2036 #define NCTX_SWIFT 0x100
2038 -#define MAX_BANKS 3 /* Allocation for all machines */
2039 +#define MAX_BANKS 8 /* Allocation for all machines */
2041 #ifndef __ASSEMBLY__
2043 diff -ruN proll_18.orig/src/udp.c proll-patch4/src/udp.c
2044 --- proll_18.orig/src/udp.c 2001-12-24 05:12:53.000000000 +0000
2045 +++ proll-patch4/src/udp.c 2004-11-13 15:50:49.000000000 +0000
2050 - register unsigned char *addr;
2051 + const register unsigned char *addr;
2053 /* Set global variables */
2059 - /* Set module name for error handling */
2060 - net_module_name = "udp";
2062 /* Register IP packet type and set write buffer pointer */
2063 if ((writebuf = reg_type(htons(ETH_P_IP), ip_recv)) == NULL)