ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/AmigaOS/main_amiga.cpp
(Generate patch)

Comparing BasiliskII/src/AmigaOS/main_amiga.cpp (file contents):
Revision 1.21 by cebix, 2002-01-15T14:58:34Z vs.
Revision 1.26 by asvitkine, 2009-10-18T16:21:19Z

# Line 1 | Line 1
1   /*
2   *  main_amiga.cpp - Startup code for AmigaOS
3   *
4 < *  Basilisk II (C) 1997-2002 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 26 | Line 26
26   #include <intuition/intuition.h>
27   #include <devices/timer.h>
28   #include <devices/ahi.h>
29 + #define __USE_SYSBASE
30   #include <proto/exec.h>
31   #include <proto/dos.h>
32   #include <proto/intuition.h>
33 + #include <inline/exec.h>
34 + #include <inline/dos.h>
35 + #include <inline/intuition.h>
36  
37   #include "sysdeps.h"
38   #include "cpu_emulation.h"
# Line 158 | Line 162 | int main(int argc, char **argv)
162          printf(" %s\n", GetString(STR_ABOUT_TEXT2));
163  
164          // Open libraries
165 <        GfxBase = OpenLibrary((UBYTE *)"graphics.library", 39);
165 >        GfxBase = OpenLibrary((UBYTE *) "graphics.library", 39);
166          if (GfxBase == NULL) {
167                  printf("Cannot open graphics.library V39.\n");
168                  exit(1);
169          }
170 <        IntuitionBase = (struct IntuitionBase *)OpenLibrary((UBYTE *)"intuition.library", 39);
170 >        IntuitionBase = (struct IntuitionBase *)OpenLibrary((UBYTE *) "intuition.library", 39);
171          if (IntuitionBase == NULL) {
172                  printf("Cannot open intuition.library V39.\n");
173                  CloseLibrary(GfxBase);
174                  exit(1);
175          }
176 <        DiskBase = (struct Library *)OpenResource((UBYTE *)"disk.resource");
176 >        DiskBase = (struct Library *)OpenResource((UBYTE *) "disk.resource");
177          if (DiskBase == NULL)
178                  QuitEmulator();
179 <        GadToolsBase = OpenLibrary((UBYTE *)"gadtools.library", 39);
179 >        GadToolsBase = OpenLibrary((UBYTE *) "gadtools.library", 39);
180          if (GadToolsBase == NULL) {
181                  ErrorAlert(STR_NO_GADTOOLS_LIB_ERR);
182                  QuitEmulator();
183          }
184 <        IFFParseBase = OpenLibrary((UBYTE *)"iffparse.library", 39);
184 >        IFFParseBase = OpenLibrary((UBYTE *) "iffparse.library", 39);
185          if (IFFParseBase == NULL) {
186                  ErrorAlert(STR_NO_IFFPARSE_LIB_ERR);
187                  QuitEmulator();
188          }
189 <        AslBase = OpenLibrary((UBYTE *)"asl.library", 36);
189 >        AslBase = OpenLibrary((UBYTE *) "asl.library", 36);
190          if (AslBase == NULL) {
191                  ErrorAlert(STR_NO_ASL_LIB_ERR);
192                  QuitEmulator();
193          }
194  
195 <        if (FindTask((UBYTE *) "« Enforcer »"))
192 <                {
195 >        if (FindTask((UBYTE *) "« Enforcer »")) {
196                  ErrorAlert(STR_ENFORCER_RUNNING_ERR);
197                  QuitEmulator();
198 <                }
198 >        }
199  
200          // These two can fail (the respective gfx support won't be available, then)
201 <        P96Base = OpenLibrary((UBYTE *)"Picasso96API.library", 2);
202 <        CyberGfxBase = OpenLibrary((UBYTE *)"cybergraphics.library", 2);
201 >        P96Base = OpenLibrary((UBYTE *) "Picasso96API.library", 2);
202 >        CyberGfxBase = OpenLibrary((UBYTE *) "cybergraphics.library", 2);
203  
204          // Read preferences
205 <        PrefsInit(argc, argv);
205 >        PrefsInit(NULL, argc, argv);
206  
207          // Open AHI
208          ahi_port = CreateMsgPort();
# Line 207 | Line 210 | int main(int argc, char **argv)
210                  ahi_io = (struct AHIRequest *)CreateIORequest(ahi_port, sizeof(struct AHIRequest));
211                  if (ahi_io) {
212                          ahi_io->ahir_Version = 2;
213 <                        if (OpenDevice((UBYTE *)AHINAME, AHI_NO_UNIT, (struct IORequest *)ahi_io, 0) == 0) {
213 >                        if (OpenDevice((UBYTE *) AHINAME, AHI_NO_UNIT, (struct IORequest *)ahi_io, 0) == 0) {
214                                  AHIBase = (struct Library *)ahi_io->ahir_Std.io_Device;
215                          }
216                  }
# Line 222 | Line 225 | int main(int argc, char **argv)
225                          QuitEmulator();
226  
227          // Check start of Chip memory (because we need access to 0x0000..0x2000)
228 <        if ((uint32)FindName(&SysBase->MemList, (UBYTE *)"chip memory") < 0x2000) {
228 >        if ((uint32)FindName(&SysBase->MemList, (UBYTE *) "chip memory") < 0x2000) {
229                  ErrorAlert(STR_NO_PREPARE_EMUL_ERR);
230                  QuitEmulator();
231          }
# Line 233 | Line 236 | int main(int argc, char **argv)
236                  ErrorAlert(STR_NO_MEM_ERR);
237                  QuitEmulator();
238          }
239 <        if (OpenDevice((UBYTE *)TIMERNAME, UNIT_MICROHZ, (struct IORequest *)timereq, 0)) {
239 >        if (OpenDevice((UBYTE *) TIMERNAME, UNIT_MICROHZ, (struct IORequest *)timereq, 0)) {
240                  ErrorAlert(STR_NO_TIMER_DEV_ERR);
241                  QuitEmulator();
242          }
# Line 265 | Line 268 | int main(int argc, char **argv)
268                          QuitEmulator();
269  
270                  RAMSize = newRAMSize;
271 <                RAMBaseHost = (uint8 *)AllocVec(RAMSize + 0x100000, MEMF_PUBLIC);
271 >                RAMBaseHost = (uint8 *)AllocVec(RAMSize - 0x100000, MEMF_PUBLIC);
272                  if (RAMBaseHost == NULL) {
273                          ErrorAlert(STR_NO_MEM_ERR);
274                          QuitEmulator();
# Line 308 | Line 311 | int main(int argc, char **argv)
311          FPUType = attn & AFF_68881 ? 1 : 0;
312  
313          // Initialize everything
314 <        if (!InitAll())
314 >        if (!InitAll(NULL))
315                  QuitEmulator();
316  
317          // Move VBR away from 0 if neccessary
# Line 318 | Line 321 | int main(int argc, char **argv)
321          if (CPUIs68060)
322                  DisableSuperBypass();
323  
324 +        memset((UBYTE *) 8, 0, 0x2000-8);
325 +
326          // Install trap handler
327          EmulatedSR = 0x2700;
328          OldTrapHandler = MainTask->tc_TrapCode;
# Line 547 | Line 552 | static __saveds void tick_func(void)
552          if (timer_port) {
553                  timer_io = (struct timerequest *)CreateIORequest(timer_port, sizeof(struct timerequest));
554                  if (timer_io) {
555 <                        if (!OpenDevice((UBYTE *)TIMERNAME, UNIT_MICROHZ, (struct IORequest *)timer_io, 0)) {
555 >                        if (!OpenDevice((UBYTE *) TIMERNAME, UNIT_MICROHZ, (struct IORequest *)timer_io, 0)) {
556                                  timer_mask = 1 << timer_port->mp_SigBit;
557                                  timer_io->tr_node.io_Command = TR_ADDREQUEST;
558                                  timer_io->tr_time.tv_secs = 0;
# Line 693 | Line 698 | struct trap_regs {     // This must match th
698  
699   void __saveds IllInstrHandler(trap_regs *r)
700   {
701 + //      D(bug("IllInstrHandler/%ld\n", __LINE__));
702 +
703          uint16 opcode = *(uint16 *)(r->pc);
704          if ((opcode & 0xff00) != 0x7100) {
705                  printf("Illegal Instruction %04x at %08lx\n", *(uint16 *)(r->pc), r->pc);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines