[Qemu-devel] qemu/hw mips_malta.c

2007-11-26 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/11/26 14:52:02

Modified files:
hw : mips_malta.c 

Log message:
Add floppy support, tested to work with www.linux-mips.org GIT head.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.51r2=1.52




[Qemu-devel] qemu hw/mips_malta.c hw/mips_mipssim.c hw/mips_...

2007-11-09 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/11/09 17:52:11

Modified files:
hw : mips_malta.c mips_mipssim.c mips_r4k.c 
target-mips: cpu.h 

Log message:
Move kernel loader parameters from the cpu state to being board 
specific.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.46r2=1.47
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_mipssim.c?cvsroot=qemur1=1.4r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.50r2=1.51
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/cpu.h?cvsroot=qemur1=1.51r2=1.52




[Qemu-devel] qemu/hw mips_malta.c

2007-06-21 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/21 23:38:13

Modified files:
hw : mips_malta.c 

Log message:
Revert workaround for -nographic segfault.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.40r2=1.41




[Qemu-devel] qemu/hw mips_malta.c

2007-06-09 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/09 15:44:26

Modified files:
hw : mips_malta.c 

Log message:
Don't try to use vt output in nographic mode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.37r2=1.38




[Qemu-devel] qemu/hw mips_malta.c

2007-06-07 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/07 12:17:52

Modified files:
hw : mips_malta.c 

Log message:
Fix firmware word endianness for Malta.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.36r2=1.37




[Qemu-devel] qemu/hw mips_malta.c

2007-06-06 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/06 16:52:12

Modified files:
hw : mips_malta.c 

Log message:
Malta has no ISA bus.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.33r2=1.34




[Qemu-devel] qemu/hw mips_malta.c

2007-06-06 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/06 16:54:26

Modified files:
hw : mips_malta.c 

Log message:
Fix formatting.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.34r2=1.35




[Qemu-devel] qemu/hw mips_malta.c

2007-06-06 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/06 17:19:25

Modified files:
hw : mips_malta.c 

Log message:
Make the Malta bootloader handling a bit more transparent.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.35r2=1.36




[Qemu-devel] qemu/hw mips_malta.c

2007-06-04 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/04 18:29:37

Modified files:
hw : mips_malta.c 

Log message:
Take advantage of subpage support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.31r2=1.32




[Qemu-devel] qemu hw/mips_malta.c target-mips/translate_init.c

2007-06-01 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/06/01 14:58:56

Modified files:
hw : mips_malta.c 
target-mips: translate_init.c 

Log message:
Add support for 5Kc/5Kf/20Kc, based on a patch by Aurelien Jarno.
Note that the F64 flag isn't usable on any of those (and the R4000),
so all our 64bit FPU goodness goes out of the window until a shadow
capability flag is implemented. :-(

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.30r2=1.31
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/translate_init.c?cvsroot=qemur1=1.11r2=1.12




[Qemu-devel] qemu hw/mips_malta.c hw/mips_pica61.c hw/mips_r...

2007-05-30 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/05/30 20:46:02

Modified files:
hw : mips_malta.c mips_pica61.c mips_r4k.c 
target-mips: cpu.h translate_init.c 

Log message:
Fix CPU (re-)selection on reset.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.28r2=1.29
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_pica61.c?cvsroot=qemur1=1.4r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.44r2=1.45
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/cpu.h?cvsroot=qemur1=1.38r2=1.39
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/translate_init.c?cvsroot=qemur1=1.9r2=1.10




[Qemu-devel] qemu/hw mips_malta.c

2007-05-30 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/05/30 21:30:06

Modified files:
hw : mips_malta.c 

Log message:
Fix typo in comment.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.29r2=1.30




[Qemu-devel] qemu/hw mips_malta.c

2007-05-04 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/05/04 14:34:34

Modified files:
hw : mips_malta.c 

Log message:
Support for simple YAMON output, by Alec Voropay.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.26r2=1.27




[Qemu-devel] qemu/hw mips_malta.c mips_pica61.c mips_r4k.c

2007-04-28 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/04/28 21:07:41

Modified files:
hw : mips_malta.c mips_pica61.c mips_r4k.c 

Log message:
Switch default CPU to 24Kf for now, as the Linux FPU emulation in
the current qemu mips emulation fails in some cases. (The Linux
FPU emulation works on real FPU-less hardware.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.25r2=1.26
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_pica61.c?cvsroot=qemur1=1.2r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.42r2=1.43




[Qemu-devel] qemu/hw mips_malta.c

2007-04-24 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/04/24 22:57:37

Modified files:
hw : mips_malta.c 

Log message:
Improved mini-bootloader, based on a patch by Alec Voropay.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.24r2=1.25




[Qemu-devel] qemu/hw mips_malta.c

2007-04-05 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/04/05 23:12:54

Modified files:
hw : mips_malta.c 

Log message:
Clear BEV and ERL for the fake bootloader.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.21r2=1.22




[Qemu-devel] qemu/hw mips_malta.c

2007-04-03 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/04/03 14:05:42

Modified files:
hw : mips_malta.c 

Log message:
Fix Malta tty2 UART registers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.20r2=1.21




Re: [Qemu-devel] qemu hw/mips_malta.c hw/mips_r4k.c target-mips/...

2007-04-02 Thread Kirill A. Shutemov
On [Sun, 01.04.2007 12:35], Thiemo Seufer wrote:
 CVSROOT:  /sources/qemu
 Module name:  qemu
 Changes by:   Thiemo Seufer ths 07/04/01 12:36:18
 
 Modified files:
   hw : mips_malta.c mips_r4k.c 
   target-mips: exec.h mips-defs.h op.c op_helper.c 
op_helper_mem.c op_mem.c translate.c 
translate_init.c 
 
 Log message:
   Actually enable 64bit configuration.

This commit broke building on x86_64:

gcc  -g -o qemu-system-mips64 vl.o osdep.o readline.o monitor.o pci.o
console.o loader.o isa_mmio.o cutils.o block.o block-raw.o block-cow.o
block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o
block-vpc.o block-vvfat.o block-qcow2.o scsi-disk.o cdrom.o lsi53c895a.o
usb.o usb-hub.o usb-linux.o usb-hid.o usb-ohci.o usb-msd.o ne2000.o
rtl8139.o pcnet.o mips_r4k.o mips_malta.o mips_timer.o mips_int.o dma.o
vga.o serial.o i8254.o i8259.o ide.o gt64xxx.o pckbd.o ps2.o fdc.o
mc146818rtc.o usb-uhci.o acpi.o ds1225y.o piix_pci.o parallel.o mixeng.o
cirrus_vga.o sb16.o es1370.o fmopl.o adlib.o audio.o noaudio.o wavaudio.o
sdlaudio.o ossaudio.o alsaaudio.o wavcapture.o gdbstub.o sdl.o x_keymap.o
vnc.o slirp/cksum.o slirp/if.o slirp/ip_icmp.o slirp/ip_input.o
slirp/ip_output.o slirp/slirp.o slirp/mbuf.o slirp/misc.o slirp/sbuf.o
slirp/socket.o slirp/tcp_input.o slirp/tcp_output.o slirp/tcp_subr.o
slirp/tcp_timer.o slirp/udp.o slirp/bootp.o slirp/debug.o slirp/tftp.o
libqemu.a  -lm -lz -lasound -Wl,-rpath,/usr/lib -lSDL -lpthread  -lrt
-lutil
libqemu.a(op_helper.o): In function `do_dmult':
/home/kas/rpm/qemu/build/qemu-0.9.0.cvs20070324/target-mips/op_helper.c:226:
undefined reference to `set_HILO'
libqemu.a(op_helper.o): In function `do_dmultu':
/home/kas/rpm/qemu/build/qemu-0.9.0.cvs20070324/target-mips/op_helper.c:232:
undefined reference to `set_HILO'
collect2: ld returned 1 exit status

-- 
Regards,  Kirill A. Shutemov
 + Belarus, Minsk
 + Velesys LLC, http://www.velesys.com/
 + ALT Linux Team, http://www.altlinux.com/


signature.asc
Description: Digital signature


Re: [Qemu-devel] qemu hw/mips_malta.c hw/mips_r4k.c target-mips/...

2007-04-02 Thread Kirill A. Shutemov
On [Sun, 01.04.2007 12:35], Thiemo Seufer wrote:
 CVSROOT:  /sources/qemu
 Module name:  qemu
 Changes by:   Thiemo Seufer ths 07/04/01 12:36:18
 
 Modified files:
   hw : mips_malta.c mips_r4k.c 
   target-mips: exec.h mips-defs.h op.c op_helper.c 
op_helper_mem.c op_mem.c translate.c 
translate_init.c 
 
 Log message:
   Actually enable 64bit configuration.

This commit broke build on x86_64:

libqemu.a(op_helper.o): In function `do_dmult':
/home/kas/rpm/qemu/build/qemu/target-mips/op_helper.c:226:
undefined reference to `set_HILO'
libqemu.a(op_helper.o): In function `do_dmultu':
/home/kas/rpm/qemu/build/qemu/target-mips/op_helper.c:232:
undefined reference to `set_HILO'
collect2: ld returned 1 exit status
make[1]: *** [qemu-system-mips64] Error 1
make[1]: Leaving directory
`/home/kas/rpm/qemu/build/qemu/mips64-softmmu'
make: *** [subdir-mips64-softmmu] Error 2

-- 
Regards,  Kirill A. Shutemov
 + Belarus, Minsk
 + Velesys LLC, http://www.velesys.com/
 + ALT Linux Team, http://www.altlinux.com/


signature.asc
Description: Digital signature


Re: [Qemu-devel] qemu hw/mips_malta.c hw/mips_r4k.c target-mips/...

2007-04-02 Thread Thiemo Seufer
Kirill A. Shutemov wrote:
 On [Sun, 01.04.2007 12:35], Thiemo Seufer wrote:
  CVSROOT:/sources/qemu
  Module name:qemu
  Changes by: Thiemo Seufer ths 07/04/01 12:36:18
  
  Modified files:
  hw : mips_malta.c mips_r4k.c 
  target-mips: exec.h mips-defs.h op.c op_helper.c 
   op_helper_mem.c op_mem.c translate.c 
   translate_init.c 
  
  Log message:
  Actually enable 64bit configuration.
 
 This commit broke build on x86_64:
 
 libqemu.a(op_helper.o): In function `do_dmult':
 /home/kas/rpm/qemu/build/qemu/target-mips/op_helper.c:226:
 undefined reference to `set_HILO'
 libqemu.a(op_helper.o): In function `do_dmultu':
 /home/kas/rpm/qemu/build/qemu/target-mips/op_helper.c:232:
 undefined reference to `set_HILO'
 collect2: ld returned 1 exit status
 make[1]: *** [qemu-system-mips64] Error 1

Updated, I hope it compiles again now.


Thiemo




[Qemu-devel] qemu hw/mips_malta.c hw/mips_r4k.c target-mips/...

2007-04-01 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/04/01 12:36:18

Modified files:
hw : mips_malta.c mips_r4k.c 
target-mips: exec.h mips-defs.h op.c op_helper.c 
 op_helper_mem.c op_mem.c translate.c 
 translate_init.c 

Log message:
Actually enable 64bit configuration.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.18r2=1.19
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.39r2=1.40
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/exec.h?cvsroot=qemur1=1.21r2=1.22
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/mips-defs.h?cvsroot=qemur1=1.9r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/op.c?cvsroot=qemur1=1.29r2=1.30
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/op_helper.c?cvsroot=qemur1=1.34r2=1.35
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/op_helper_mem.c?cvsroot=qemur1=1.6r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/op_mem.c?cvsroot=qemur1=1.6r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/translate.c?cvsroot=qemur1=1.42r2=1.43
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/translate_init.c?cvsroot=qemur1=1.3r2=1.4




[Qemu-devel] qemu/hw mips_malta.c

2007-03-02 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/03/02 20:36:23

Modified files:
hw : mips_malta.c 

Log message:
Fix wrong interrupt number for the second serial interface.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.13r2=1.14


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


[Qemu-devel] qemu/hw mips_malta.c

2007-02-28 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/02/28 20:04:26

Modified files:
hw : mips_malta.c 

Log message:
24C01 / 24C02 EEPROM emulation for Malta, by Stefan Weil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.12r2=1.13


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


[Qemu-devel] qemu/hw mips_malta.c

2007-02-21 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/02/21 22:32:19

Modified files:
hw : mips_malta.c 

Log message:
Allow arbitrary MIPS BIOS sizes between 0 and 4 MB, by Stefan Weil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.10r2=1.11


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


[Qemu-devel] qemu/hw mips_malta.c

2007-02-20 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/02/20 13:39:32

Modified files:
hw : mips_malta.c 

Log message:
2nd serial port for Malta, by Jason Wessel.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.8r2=1.9


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


[Qemu-devel] qemu hw/mips_malta.c hw/mips_r4k.c target-mips/...

2007-02-20 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/02/20 23:37:21

Modified files:
hw : mips_malta.c mips_r4k.c 
target-mips: cpu.h helper.c op_helper.c op_helper_mem.c 
 translate.c 

Log message:
Replace TLSZ with TARGET_FMT_lx.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.9r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.34r2=1.35
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/cpu.h?cvsroot=qemur1=1.20r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/helper.c?cvsroot=qemur1=1.25r2=1.26
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/op_helper.c?cvsroot=qemur1=1.29r2=1.30
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/op_helper_mem.c?cvsroot=qemur1=1.5r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemu/target-mips/translate.c?cvsroot=qemur1=1.32r2=1.33


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


[Qemu-devel] qemu/hw mips_malta.c mips_r4k.c

2007-02-17 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/02/18 00:10:59

Modified files:
hw : mips_malta.c mips_r4k.c 

Log message:
Add PS/2 keyboard to MIPS R4K, by Herve Poussineau.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.7r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.33r2=1.34


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


Re: [Qemu-devel] qemu/hw mips_malta.c mips_r4k.c

2007-01-25 Thread Aurelien Jarno
On Wed, Jan 24, 2007 at 10:00:13PM +, Thiemo Seufer wrote:
 CVSROOT:  /sources/qemu
 Module name:  qemu
 Changes by:   Thiemo Seufer ths 07/01/24 22:00:13
 
 Modified files:
   hw : mips_malta.c mips_r4k.c 
 
 Log message:
   Fix malta emulation for 64bit qemu.
 
 CVSWeb URLs:
 http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.5r2=1.6
 http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.32r2=1.33
 

This changes breaks malta emulation on 64-bit hosts. Please find a patch
below to fix that. The changes to the bootloader part may looks huge,
but it's actually just to keep the comments aligned. Also we don't need
sign extent for the bootloader code, as it is done by the lui
instruction when executed.

Index: mips_malta.c
===
RCS file: /sources/qemu/qemu/hw/mips_malta.c,v
retrieving revision 1.6
diff -u -d -p -r1.6 mips_malta.c
--- mips_malta.c24 Jan 2007 22:00:12 -  1.6
+++ mips_malta.c25 Jan 2007 10:28:48 -
@@ -32,12 +32,11 @@
 
 #ifdef MIPS_HAS_MIPS64
 #define INITRD_LOAD_ADDR   (int64_t)0x8080
-#define ENVP_ADDR  (int64_t)0x80002000
 #else
 #define INITRD_LOAD_ADDR   (int32_t)0x8080
-#define ENVP_ADDR  (int32_t)0x80002000
 #endif
 
+#define ENVP_ADDR  (int32_t)0x80002000
 #define VIRT_TO_PHYS_ADDEND(-((int64_t)(int32_t)0x8000))
 
 #define ENVP_NB_ENTRIES16
@@ -390,36 +389,36 @@ static void write_bootloader (CPUState *
 
 /* Small bootloader */
 p = (uint32_t *) (phys_ram_base + bios_offset);
-stl_raw(p++, 0x0bf00010);   /* j 0x1fc00040 */
-stl_raw(p++, 0x);   /* nop */
+stl_raw(p++, 0x0bf00010);  /* j 
0x1fc00040 */
+stl_raw(p++, 0x);  /* nop */
 
 /* Second part of the bootloader */
 p = (uint32_t *) (phys_ram_base + bios_offset + 0x040);
-stl_raw(p++, 0x3c04);  /* lui a0, 0 */
-stl_raw(p++, 0x34840002);   /* ori a0, a0, 2 */
-stl_raw(p++, 0x3c05 | ((ENVP_ADDR)  16)); /* lui a1, 
high(ENVP_ADDR) */
-stl_raw(p++, 0x34a5 | ((ENVP_ADDR)  0x));  /* ori a1, a0, 
low(ENVP_ADDR) */
-stl_raw(p++, 0x3c06 | ((ENVP_ADDR + 8)  16)); /* lui a2, 
high(ENVP_ADDR + 8) */
-stl_raw(p++, 0x34c6 | ((ENVP_ADDR + 8)  0x));  /* ori a2, a2, 
low(ENVP_ADDR + 8) */
-stl_raw(p++, 0x3c07 | ((env-ram_size)  16)); /* lui a3, 
high(env-ram_size) */
-stl_raw(p++, 0x34e7 | ((env-ram_size)  0x));  /* ori a3, a3, 
low(env-ram_size) */
-stl_raw(p++, 0x3c1f | ((kernel_addr)  16));   /* lui ra, 
high(kernel_addr) */;
-stl_raw(p++, 0x37ff | ((kernel_addr)  0x));/* ori ra, ra, 
low(kernel_addr) */
-stl_raw(p++, 0x03e8);   /* jr ra */
-stl_raw(p++, 0x);   /* nop */
+stl_raw(p++, 0x3c04);  /* lui a0, 
0 */
+stl_raw(p++, 0x34840002);  /* ori a0, 
a0, 2 */
+stl_raw(p++, 0x3c05 | ((ENVP_ADDR  16)  0x));   /* lui a1, 
high(ENVP_ADDR) */
+stl_raw(p++, 0x34a5 | (ENVP_ADDR  0x));   /* ori a1, 
a0, low(ENVP_ADDR) */
+stl_raw(p++, 0x3c06 | (((ENVP_ADDR + 8)  16)  0x)); /* lui a2, 
high(ENVP_ADDR + 8) */
+stl_raw(p++, 0x34c6 | ((ENVP_ADDR + 8)  0x)); /* ori a2, 
a2, low(ENVP_ADDR + 8) */
+stl_raw(p++, 0x3c07 | (env-ram_size  16));  /* lui a3, 
high(env-ram_size) */
+stl_raw(p++, 0x34e7 | (env-ram_size  0x));   /* ori a3, 
a3, low(env-ram_size) */
+stl_raw(p++, 0x3c1f | ((kernel_addr  16)  0x)); /* lui ra, 
high(kernel_addr) */;
+stl_raw(p++, 0x37ff | (kernel_addr  0x)); /* ori ra, 
ra, low(kernel_addr) */
+stl_raw(p++, 0x03e8);  /* jr ra */
+stl_raw(p++, 0x);  /* nop */
 }
 
 static void prom_set(int index, const char *string, ...)
 {
 va_list ap;
-uint32_t *p;
-uint32_t table_addr;
+int32_t *p;
+int32_t table_addr;
 char *s;
 
 if (index = ENVP_NB_ENTRIES)
 return;
 
-p = (uint32_t *) (phys_ram_base + ENVP_ADDR + VIRT_TO_PHYS_ADDEND);
+p = (int32_t *) (phys_ram_base + ENVP_ADDR + VIRT_TO_PHYS_ADDEND);
 p += index;
 
 if (string == NULL) {
@@ -427,7 +426,7 @@ static void prom_set(int index, const ch
 return;
 }
 
-table_addr = ENVP_ADDR + sizeof(uint32_t) * ENVP_NB_ENTRIES + index * 
ENVP_ENTRY_SIZE;
+table_addr = ENVP_ADDR + sizeof(int32_t) * ENVP_NB_ENTRIES + index * 
ENVP_ENTRY_SIZE;
 s = (char *) 

[Qemu-devel] qemu/hw mips_malta.c mips_r4k.c

2007-01-24 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/01/24 22:00:13

Modified files:
hw : mips_malta.c mips_r4k.c 

Log message:
Fix malta emulation for 64bit qemu.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.5r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_r4k.c?cvsroot=qemur1=1.32r2=1.33


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel


[Qemu-devel] qemu/hw mips_malta.c

2007-01-17 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/01/17 15:15:52

Modified files:
hw : mips_malta.c 

Log message:
Disable Malta floppy controller for now, by Aurelien Jarno.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/mips_malta.c?cvsroot=qemur1=1.1r2=1.2


___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel