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

Comparing BasiliskII/src/Unix/main_unix.cpp (file contents):
Revision 1.35 by cebix, 2001-06-30T12:58:08Z vs.
Revision 1.36 by cebix, 2001-06-30T17:21:54Z

# Line 317 | Line 317 | int main(int argc, char **argv)
317          // Allocate scratch memory
318          ScratchMem = (uint8 *)vm_acquire(SCRATCH_MEM_SIZE);
319          if (ScratchMem == VM_MAP_FAILED) {
320 <                ErrorAlert(GetString(STR_NO_MEM_ERR));
320 >                ErrorAlert(STR_NO_MEM_ERR);
321                  QuitEmulator();
322          }
323          ScratchMem += SCRATCH_MEM_SIZE/2;       // ScratchMem points to middle of block
# Line 335 | Line 335 | int main(int argc, char **argv)
335                  RAMBaseHost = (uint8 *)vm_acquire(RAMSize);
336                  ROMBaseHost = (uint8 *)vm_acquire(0x100000);
337                  if (RAMBaseHost == VM_MAP_FAILED || ROMBaseHost == VM_MAP_FAILED) {
338 <                        ErrorAlert(GetString(STR_NO_MEM_ERR));
338 >                        ErrorAlert(STR_NO_MEM_ERR);
339                          QuitEmulator();
340                  }
341          }
# Line 359 | Line 359 | int main(int argc, char **argv)
359          // Load Mac ROM
360          int rom_fd = open(rom_path ? rom_path : ROM_FILE_NAME, O_RDONLY);
361          if (rom_fd < 0) {
362 <                ErrorAlert(GetString(STR_NO_ROM_FILE_ERR));
362 >                ErrorAlert(STR_NO_ROM_FILE_ERR);
363                  QuitEmulator();
364          }
365          printf(GetString(STR_READING_ROM_FILE));
366          ROMSize = lseek(rom_fd, 0, SEEK_END);
367          if (ROMSize != 64*1024 && ROMSize != 128*1024 && ROMSize != 256*1024 && ROMSize != 512*1024 && ROMSize != 1024*1024) {
368 <                ErrorAlert(GetString(STR_ROM_SIZE_ERR));
368 >                ErrorAlert(STR_ROM_SIZE_ERR);
369                  close(rom_fd);
370                  QuitEmulator();
371          }
372          lseek(rom_fd, 0, SEEK_SET);
373          if (read(rom_fd, ROMBaseHost, ROMSize) != (ssize_t)ROMSize) {
374 <                ErrorAlert(GetString(STR_ROM_FILE_READ_ERR));
374 >                ErrorAlert(STR_ROM_FILE_READ_ERR);
375                  close(rom_fd);
376                  QuitEmulator();
377          }
# Line 423 | Line 423 | int main(int argc, char **argv)
423          sig_stack = malloc(SIG_STACK_SIZE);
424          D(bug("Signal stack at %p\n", sig_stack));
425          if (sig_stack == NULL) {
426 <                ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
426 >                ErrorAlert(STR_NOT_ENOUGH_MEMORY_ERR);
427                  QuitEmulator();
428          }
429          stack_t new_stack;

Diff Legend

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