6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 04:30:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #256 from polluks/master

Browse Source 
Changed stdout to stderr to separate sim65's output streams. Suggeste…
This commit is contained in:
Oliver Schmidt 2016-01-05 21:13:12 +01:00
commit 8e297aacd1
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/index.sgml
View File

@ -89,7 +89,7 @@
An overview over the cc65 runtime and C libraries. An overview over the cc65 runtime and C libraries.
<tag><htmlurl url="smc.html" name="smc.html"></tag> <tag><htmlurl url="smc.html" name="smc.html"></tag>
Describes Christian Kr&uuml;gers macro package for writing self modifying Describes Christian Kr&uuml;ger's macro package for writing self modifying
assembler code. assembler code.
<tag><url name="6502 Binary Relocation Format document" <tag><url name="6502 Binary Relocation Format document"

4
doc/sim65.sgml
View File

@ -73,8 +73,8 @@ Here is a description of all the command line options:
<sect>Input and output<p> <sect>Input and output<p>
The simulator will read one binary file per invocation and can log some The simulator will read one binary file per invocation and can log the
library calls. program loading and paravirtualization calls to stderr.
Example output for the command Example output for the command
<tscreen><verb> <tscreen><verb>

4
src/sim65/main.c
View File

@ -156,7 +156,7 @@ static void ReadProgramFile (void)
/* Close the file */ /* Close the file */
fclose (F); fclose (F);
Print (stdout, 1, "Loaded `%s' at $0200-$%04X\n", ProgramFile, Addr - 1); Print (stderr, 1, "Loaded `%s' at $0200-$%04X\n", ProgramFile, Addr - 1);
} }
@ -238,7 +238,7 @@ int main (int argc, char* argv[])
ExecuteInsn (); ExecuteInsn ();
if (MaxCycles && (GetCycles () >= MaxCycles)) { if (MaxCycles && (GetCycles () >= MaxCycles)) {
Error ("Maximum number of cycles reached."); Error ("Maximum number of cycles reached.");
exit (-99); /* do not ues EXIT_FAILURE to avoid conflicts with the exit (-99); /* do not use EXIT_FAILURE to avoid conflicts with the
same value being used in a test program */ same value being used in a test program */
} }
} }

12
src/sim65/paravirt.c
View File

@ -128,7 +128,7 @@ static void PVArgs (CPURegs* Regs)
unsigned SP = MemReadZPWord (0x00); unsigned SP = MemReadZPWord (0x00);
unsigned Args = SP - (ArgC + 1) * 2; unsigned Args = SP - (ArgC + 1) * 2;
Print (stdout, 2, "PVArgs ($%04X)\n", ArgV); Print (stderr, 2, "PVArgs ($%04X)\n", ArgV);
MemWriteWord (ArgV, Args); MemWriteWord (ArgV, Args);
@ -155,7 +155,7 @@ static void PVArgs (CPURegs* Regs)
static void PVExit (CPURegs* Regs) static void PVExit (CPURegs* Regs)
{ {
Print (stdout, 1, "PVExit ($%02X)\n", Regs->AC); Print (stderr, 1, "PVExit ($%02X)\n", Regs->AC);
exit (Regs->AC); exit (Regs->AC);
} }
@ -177,7 +177,7 @@ static void PVOpen (CPURegs* Regs)
} }
while (Path[I++]); while (Path[I++]);
Print (stdout, 2, "PVOpen (\"%s\", $%04X)\n", Path, Flags); Print (stderr, 2, "PVOpen (\"%s\", $%04X)\n", Path, Flags);
switch (Flags & 0x03) { switch (Flags & 0x03) {
case 0x01: case 0x01:
@ -219,7 +219,7 @@ static void PVClose (CPURegs* Regs)
unsigned FD = GetAX (Regs); unsigned FD = GetAX (Regs);
Print (stdout, 2, "PVClose ($%04X)\n", FD); Print (stderr, 2, "PVClose ($%04X)\n", FD);
RetVal = close (FD); RetVal = close (FD);
@ -237,7 +237,7 @@ static void PVRead (CPURegs* Regs)
unsigned Buf = PopParam (2); unsigned Buf = PopParam (2);
unsigned FD = PopParam (2); unsigned FD = PopParam (2);
Print (stdout, 2, "PVRead ($%04X, $%04X, $%04X)\n", FD, Buf, Count); Print (stderr, 2, "PVRead ($%04X, $%04X, $%04X)\n", FD, Buf, Count);
Data = xmalloc (Count); Data = xmalloc (Count);
@ -264,7 +264,7 @@ static void PVWrite (CPURegs* Regs)
unsigned Buf = PopParam (2); unsigned Buf = PopParam (2);
unsigned FD = PopParam (2); unsigned FD = PopParam (2);
Print (stdout, 2, "PVWrite ($%04X, $%04X, $%04X)\n", FD, Buf, Count); Print (stderr, 2, "PVWrite ($%04X, $%04X, $%04X)\n", FD, Buf, Count);
Data = xmalloc (Count); Data = xmalloc (Count);
while (I < Count) { while (I < Count) {