Commit Graph

726 Commits

Author SHA1 Message Date
urchlay 61fb6e631b Messing with the parser, nothing conclusive yet
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@635 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-12 21:50:43 +00:00
stephena c6db07b077 Addition of classes to be used in full conditional breakpoint support.
Yes folks, it's coming, and if everything works out it will be the
fastest implementation yet for any Atari 2600 debugger.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@634 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-12 17:02:35 +00:00
urchlay 5702496cdc Made EquateList use a couple of STL maps to store address => label and
label => address mappings. It should be faster than the linear search,
and it's a damn sight cleaner. Still TODO is to restore the case-insensitive
string matching from the original version.

Changed a few EquateList methods that used to return char*, so they now
return string or string&. Changed other classes that call them so they
work with the new return types.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@633 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-12 02:27:07 +00:00
urchlay 9bce69cd2b Added "runto" command. It takes a string argument, runs one 6502
instruction at a time, and before each instruction it disassembles the
next instruction. If the disassembly result contains the string arg,
stop executing and return.

This let us say things like "runto STA" to run until the next STA
instruction, or "runto LABEL", or whatever else. It does *not* use the
breakpoint nor trap mechanisms.

Unfortunately, as written, Debugger::disassemble is *slow*... "runto"
takes about 40-50 seconds to execute one frames' worth of 6502
instructions on an Athlon 1200. Also, as written, it's uninterruptible:
while it's slowly doing its thing, the SDL main loop isn't running,
so you can't even close the Stella window to get out...

Also, it would be nice to be able to tell "runto" which field you want
to search (address label, instruction name, operand). Splitting it out
this way could also make it faster: instead of doing a full disassemble
and searching it, we could have "runto LABEL" evaluate the label and
just stop when the PC equals the target (would be almost as fast as
just using a breakpoint). We may create separate commands for this:
"runtoaddr", "runtoinstr"...?

Being able to say "run until the next RTS instruction" is a lot more
expressive than having to disassemble until you find the RTS, set a
breakpoint after it, then "run", then remove the breakpoint...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@632 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-11 18:56:27 +00:00
stephena f5321fcfa4 Fixed bug(s) whereby the debugger could be entered and exited in
different ways, and hence sometimes certain things were done
and not at other times.  Now there's only one way to enter/exit
the debugger.  This fixes the problem of locking/unlocking the
data bus in debugger mode; a lock is done on entry and released
on exit.

The above change may expose other bugs.  I haven't tested
extensively, but if something has stopped working it's because
it relied on buggy code.

Cleaned up the Debugger class definition a little, adding some
documentation and making certain things private when they didn't
absolutely need to be public.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@631 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-10 02:16:01 +00:00
urchlay 6ef90324bf Implemented data bus state locking, so the debugger won't disturb the
System when it uses peek() to examine memory/TIA/etc.

I'm not entirely sure I put a lockDataBus() call where it will get
executed when the user presses ` to enter the debugger: I put it in
Debugger::start() (does everything call this, or does EventHandler do
something else?), and again in Debugger::state() (which gets called to
build every prompt string).

There are unlockDataBus() calls everywhere in the Debugger where we
execute 6502 code, including Debugger::quit(). Does the EventHandler
call quit() when it exits the debugger (if the user presses ` I mean)?


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@630 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-09 23:44:08 +00:00
urchlay adb22f7b00 Added detection for 3E carts. As it was, 3E carts would detect as 3F,
so it's just one test (search for STA $3E in the image) to distinguish
between the two. I still only have 3 3E images (notBD PAL and NTSC,
and Armin's test cart), but all 3 are detected, at least. Autodetection
isn't as important in Stella as it is in some other emulators, due to
the stella.pro database, so I won't try to make this too smart for its
own good...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@629 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-09 15:19:24 +00:00
stephena 3fabe0ece8 Cleaned up accessing the TIA from System class. Brian, I'm not sure
if this is needed for anything other than 3E type, but since it
doesn't cause any overhead, I went ahead and did it anyway (after
reading your messages on Stella list).

Please test to make sure it still works, but I don't think there'll
be any problems.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@628 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-09 12:52:46 +00:00
urchlay 9f354edb8a 3E and 3F bankswitching now pass pokes to addresses $00-$3F through to
the TIA. For 3E, this means game authors don't need to access the TIA
through a mirror (and there's no reason they should on real hardware,
either). It also means Armin's test cart image works.

3F ROMs still need to use a mirror: poking to $00-$2C writes to the
TIA *and* switches banks, which is not that you'd want to do. Stella's
behaviour now matches a real Tigervision 3F cart, for what it's worth.

Unfortunately I had to do something nasty to allow the Cart classes to
directly access the TIA: see System.hxx and System.cxx (search for
the tiaPoke() method.)


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@627 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-09 00:59:13 +00:00
stephena 090bf3dc3e Forgot to remove debugging code.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@626 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 21:25:33 +00:00
stephena 0bcf843c89 Converted TIADebug to be a DebuggerSystem object. There's some strange
stuff going on in the TIA class ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@625 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 17:22:41 +00:00
stephena 6aa2830d71 Cleaned up the Debugger class by moving all CPU related stuff to
CpuDebug.  This is similar to the last commit, which moved all RAM
stuff to RamDebug.

Removed D6502, since it's functionality is provided by CpuDebug and is
no longer required.

The only user-visible change is that the CPU registers in CPU tab now
track changes.  It may seem like a lot of work to just accomplish that,
but the infrastructure will make it much easier to add similar
functionality to new tabs.  Besides, we needed to step back a little
and clean up the codebase.

Still TODO is turn TIADebug into a real DebuggerSystem object, and
finish the TIA tab.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@624 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 14:36:18 +00:00
stephena 9b780540fb Ported prompt 'ram' command to the new DebuggerSystem functionality.
I'll be doing small commits after each subsystem is ported, to make sure
I don't do anything too destructive.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@623 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 12:36:06 +00:00
urchlay 15a11860c8 Duh...
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@622 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 12:16:01 +00:00
urchlay 2e440f7e26 Cart3E save state now saves RAM as it should.
Cart3E::patch() now can patch RAM (before, it would have segfaulted if
you'd tried)

Cart3E constructor now initializes RAM to random junk instead of leaving
it uninitialized (which still means full of junk...)


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@621 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 12:14:18 +00:00
stephena 982045d664 Fixed missing detection for 3E bankswitching method. Brian, ignore my
previous email, since this fixes the problem.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@620 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 11:50:32 +00:00
urchlay dda4c98658 Added support for 3E bankswitch scheme (3F plus 32K RAM). Only tested
with Andrew Davies' early notBoulderDash demo.

Added entry to stella.pro for the demo


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@619 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 04:01:29 +00:00
urchlay 07786e3faf Added support for 3E bankswitch scheme (3F plus 32K RAM).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@618 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-08 04:00:09 +00:00
stephena 2be337302a Fixed wrong labels on RAM cells in RamWidget.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@617 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-07 20:51:10 +00:00
stephena 8aff84f2c3 First pass at CpuDebug. In adding this class, I realized that it's just
a reimplementation of D6502.  So D6502 will disappear soon.  The reason
Debugger class has been getting so big is that there was only D6502 defined,
when there should have been also DTia, DRam, etc.  The DebuggerSystem
classes are now providing that functionality.

The codebase may be broken over the next few days because of this, but
it's better to do it properly (I get the feeling it may never be fixed if
we don't do it now).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@616 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-07 18:56:41 +00:00
stephena c3fab46791 Added DebuggerSystem and DebuggerState classes to clean up the unwieldy
Debugger class.  There will be a subsystem for each GUI debugger tab,
and it will have responsibility for all thing related to that tab,
eliminating a lot of code from Debugger class.

Added RamDebug class, and changed the GUI RAM tab to use the new RamDebug
subsystem.  The prompt still uses the old method, which will have to be
fixed.  At that point, Debugger::(readRAM, writeRAM, ramChanged) can be
eliminated.  If the Debugger ever wants to access RAM related things,
it should refer to RamDebug.

Still TODO is create a CpuDebug subsystem, and turn the current TIADebug
into a real subsystem.

Cleaned up some redundant typedefs (changed AddrList/ValueList to
IntArray).  As well, we're moving away from having bspf stuff seeded
throughout the system.  Integer values will be stored/passed around as
'int', and truncated where necessary as close to the given method as
possible.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@615 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-07 15:19:04 +00:00
urchlay ad5ab7be92 Added -break command line option. It sets a breakpoint before emulation
even starts, so you can enter the debugger before the first frame is
even drawn. This will be useful for everyone, but I particularly need it
for testing per-scanline TIA update code (which doesn't even exist yet).

I should eventually be able to run "stella -break kernel poker.bin" and
then advance one scanline at a time, watching the first frame get drawn.
Not even close yet :)


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@614 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-07 02:30:48 +00:00
stephena d0534cb746 More additions to the TiaWidget, but none of it is functional yet :)
Increased debugger window width to 639 pixels.  We've already passed the
512x384 mark, so it's no use restricting width to 512 anymore.  Besides,
the extra width will come in handy for the TiaWidget, and maybe the
PromptWidget can now use one less line in the state() display.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@613 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-06 19:09:26 +00:00
stephena 1b81357126 Second pass at TiaWidget. It now contains a DataGridWidget for the 16 bytes
of RAM in the TIA, but it isn't tied to the TIA yet (so changes have no
effect).  I suspect that development on this tab will now proceed quickly,
since I think I've found a way to lay everything out in one tab.

Removed the 2 second delay from configure when an invalid option is
given.  There's no need to delay; printing an error is sufficient.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@612 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-06 15:09:16 +00:00
urchlay ed06990d04 configure script now prints "warning: unrecognized option" and sleeps
for 2 seconds instead of silently ignoring wrong options. This seems
like a good compromise to me (I've typed "./configure --disable-opengl"
about 50 times now, and of course it doesn't work because it's supposed
to say "--disable-gl")


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@611 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-05 19:29:57 +00:00
stephena 135f662a03 Removed obsolete makefile. Stella will now exclusively use the configure
system, and if that doesn't work for someone, we'll fix it at that level.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@610 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-05 18:06:13 +00:00
stephena 025e99900c Reworked DataGridWidget so the common operations (increment, decrement, etc)
are part of the class itself.  That means all DataGridWidgets (currently
RAM contents and CPU registers) get access to the key shortcuts.

Modified DataGridWidget to accept the number of bits in its cells, and
made sure the above listed operations are restricted to that number
of bits.  That means when we add DataGridWidgets for Tia stuff with
weird bit lengths, changing data will work correctly.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@609 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-05 18:00:05 +00:00
stephena 1e1ce94b7d Added 'id' item to handleCommand(), so that the method knows which widget
has sent a signal (required when there are more than one of the same type of
widget in a widget/container).

Still TODO is modify each handleCommand() method that cares about 'id' to
actually detect and act on it.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@608 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-05 15:25:45 +00:00
stephena 3e0a2db948 Made the arrow keys in DataGridWidget 'wrap around', so that when the end
a row/column is reached, it goes to the next row/column.  The reason for
this will become apparent over the next day or so.

Still TODO is revamp the base widget to accept and return an identifier
for which widget it is, since every widget/dialog in the debugger
currently assumes that there's only one type of each widget (so if there
are two DataGridWidgets, the returned signal doesn't know which one
to use).  Sorry if that sounds confusing ;)


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@607 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-05 00:07:58 +00:00
stephena fe8c605d8d Start of the TiaWidget. This one is going to be huge, and may take some
time to finish.

Changed colors of modified cells in DataGridWidget.  They're now much
easier to see.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@606 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-04 15:59:38 +00:00
urchlay c4d5f9d54b My first stab at adding features to the GUI: Added shortcut keys for the
Inv, Neg, etc. buttons on the RAM tab. Also added Undo and Revert buttons
to the RAM tab. Undo undoes your last change only (and does not undo an
undo). Revert reverts RAM to the state it was in when the user entered
the RAM tab. These buttons are disabled when they're not useful.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@605 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 21:14:42 +00:00
stephena a1fb0b5057 Some fixes for compilation under MinGW and Visual C++ .Net.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@604 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 14:18:54 +00:00
stephena 6f2c71053a Tweaked configure to silently ignore commandline options it doesn't know
about.  No use in quitting if the option wouldn't have had any effect
anyway.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@603 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 12:50:19 +00:00
urchlay 84f1e6d0f3 Updated debugger docs a bit
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@602 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 09:16:11 +00:00
urchlay 318122fae1 Fixed collision display in "tia" cmd: used && where I shoulda used &
Booleans in "tia" output are now +FOO or -foo (UPPERCASE is set, lower
is clear, plus there's a + or - in front).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@601 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 08:56:48 +00:00
urchlay 16a17330ed Added "riot" command. It shows the RIOT regs in raw and decoded forms.
Currently, entering the debugger turns off all the joystick and button
inputs, so we're stuck showing "(no directions)" for the sticks. This
needs a change in EventHandler to fix (assuming it can even be done).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@600 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 08:15:31 +00:00
urchlay 94e4add1b7 "tia" command now shows all TIA regs except the strobes. All numeric output
is in the current number base except the binary graphics data. Audio frequency
is shown both as AUDFx value and frequency in Hz. Boolean flags are now
shown with a prefixed + for true or - for false (e.g. "-delay" for a player
if it's not delayed or "+delay" if it is).

There are still a few TIA internal state values that should be displayed:
delayed graphics data and color clocks at which RESxx was strobed.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@599 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 06:49:40 +00:00
stephena bad918cd14 Bumped version for next alpha release.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@598 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 01:54:46 +00:00
urchlay 2269fb27c2 Many changes to the "tia" command output. It's almost finished now, and
is useful as-is.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@597 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 01:36:40 +00:00
stephena 1ba494a859 Fixed bug whereby changes made to RAM from frame advance weren't showing
up in the RamWidget.  FrameBuffer::advance() now advances all frames and
then returns, instead of setting a flag to advance and then return
immediately (RAM wasn't being updated until the frames where advanced,
but by that point we'd returned from the method).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@596 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-03 00:53:59 +00:00
stephena a7fefcd123 Added tracking of changes directly to the DataGridWidget. That means the
CpuWidget automatically gets this support as well.

Still TODO is revamp the loadConfig() method so that updates are only made
when absolutely necessary.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@595 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 21:15:22 +00:00
stephena 2fa65c7921 Added infrastructure for the DataGridWidget to track state changes,
by making use of the Debugger::ramChanged() method.  Still TODO is
actually 'draw' those changes.

Cleaned up Array typedefs, placing them in the Array class.  Also
removed StringArray typedef, since there's already a StringList
class that does exactly the same thing.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@594 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 18:34:54 +00:00
urchlay b3479e8e9a "dumpram" now respects the default base. If dumping binary, only 4 bytes
per line are displayed. There's room for more, but not for 8... and I
expect each line to contain a power-of-two's worth of bytes for some
reason (I tried 6 bytes/line, it was somehow jarring).

Added bool Debugger::ramChanged(uInt 8 offset) method for the GUI RAM tab
to use.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@593 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 18:03:09 +00:00
urchlay 3501378714 Prompt now shows RAM locations that have changed since the last RAM command
in inverse video.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@592 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 17:15:42 +00:00
stephena 040a8d7d22 Fixed inverse character draws to use the character height, not the line height.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@591 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 15:36:44 +00:00
urchlay 584baab7d1 Prompt status line displays changed registers in inverse video. We check
for changes on step, trace, and run commands.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@590 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 15:31:30 +00:00
urchlay 31708d4a7f DebuggerParser now uses TIA color 0x34 for error messages (which is a
light red color).

Inverse video in the PromptWidget is supported, without having to
rewrite any FrameBuffer code.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@589 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 14:58:45 +00:00
stephena bd03f7d80f Integrated main TIA palette and GUI colors. That means the GUI can use
any TIA color when drawing lines, characters, etc.

The number of available colors is in GuiUtils::kNumColors, and is currently
set to 262 (256 TIA colors, 6 GUI colors).  The enumerated names for the 6
GUI colors are still used; there aren't yet any enumerations for the TIA
colors, so you have to refer to them by index number.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@588 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-02 01:28:43 +00:00
stephena 6eafefb3a5 Made Yacc stuff be part of DEVELOPER_SUPPORT, so it's only compiled
when we want the debugger.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@587 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-01 13:59:40 +00:00
urchlay e91ac28927 You know, when adding a directory to a proejct, it's often beneficial
to "cvs add" it...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@586 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-07-01 04:29:18 +00:00