diff --git a/Cocoa/Document.h b/Cocoa/Document.h
index 6a47aa7..9e1e73d 100644
--- a/Cocoa/Document.h
+++ b/Cocoa/Document.h
@@ -7,7 +7,12 @@
@property (strong) IBOutlet NSPanel *consoleWindow;
@property (strong) IBOutlet NSTextField *consoleInput;
@property (strong) IBOutlet NSWindow *mainWindow;
+@property (strong) IBOutlet NSView *memoryView;
+@property (strong) IBOutlet NSPanel *memoryWindow;
+-(uint8_t) readMemory:(uint16_t) addr;
+-(void) writeMemory:(uint16_t) addr value:(uint8_t)value;
+-(void) performAtomicBlock: (void (^)())block;
@end
diff --git a/Cocoa/Document.m b/Cocoa/Document.m
index 3aec220..2a7a89d 100644
--- a/Cocoa/Document.m
+++ b/Cocoa/Document.m
@@ -4,6 +4,9 @@
#include "AppDelegate.h"
#include "gb.h"
#include "debugger.h"
+#include "memory.h"
+#include "HexFiend/HexFiend.h"
+#include "GBMemoryByteArray.h"
@interface Document ()
{
@@ -14,6 +17,7 @@
bool tooMuchLogs;
bool fullScreen;
bool in_sync_input;
+ HFController *hex_controller;
NSString *lastConsoleInput;
}
@@ -62,7 +66,7 @@ static uint32_t rgbEncode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b)
volatile bool stopping;
NSConditionLock *has_debugger_input;
NSMutableArray *debugger_input_queue;
- bool is_inited;
+ volatile bool is_inited;
}
- (instancetype)init {
@@ -122,9 +126,12 @@ static uint32_t rgbEncode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b)
} andSampleRate:96000];
self.view.mouseHidingEnabled = YES;
[self.audioClient start];
+ NSTimer *hex_timer = [NSTimer timerWithTimeInterval:0.25 target:self selector:@selector(reloadMemoryView) userInfo:nil repeats:YES];
+ [[NSRunLoop mainRunLoop] addTimer:hex_timer forMode:NSDefaultRunLoopMode];
while (running) {
GB_run(&gb);
}
+ [hex_timer invalidate];
[self.audioClient stop];
self.audioClient = nil;
self.view.mouseHidingEnabled = NO;
@@ -154,8 +161,8 @@ static uint32_t rgbEncode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b)
{
bool was_cgb = gb.is_cgb;
[self stop];
- GB_free(&gb);
is_inited = false;
+ GB_free(&gb);
if (([sender tag] == 0 && was_cgb) || [sender tag] == 2) {
[self initCGB];
}
@@ -200,6 +207,51 @@ static uint32_t rgbEncode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b)
}
+- (void) initMemoryView
+{
+ hex_controller = [[HFController alloc] init];
+ [hex_controller setBytesPerColumn:1];
+ [hex_controller setFont:[NSFont userFixedPitchFontOfSize:12]];
+ [hex_controller setEditMode:HFOverwriteMode];
+
+ [hex_controller setByteArray:[[GBMemoryByteArray alloc] initWithDocument:self]];
+
+ /* Here we're going to make three representers - one for the hex, one for the ASCII, and one for the scrollbar. To lay these all out properly, we'll use a fourth HFLayoutRepresenter. */
+ HFLayoutRepresenter *layoutRep = [[HFLayoutRepresenter alloc] init];
+ HFHexTextRepresenter *hexRep = [[HFHexTextRepresenter alloc] init];
+ HFStringEncodingTextRepresenter *asciiRep = [[HFStringEncodingTextRepresenter alloc] init];
+ HFVerticalScrollerRepresenter *scrollRep = [[HFVerticalScrollerRepresenter alloc] init];
+ HFLineCountingRepresenter *lineRep = [[HFLineCountingRepresenter alloc] init];
+ HFStatusBarRepresenter *statusRep = [[HFStatusBarRepresenter alloc] init];
+
+ lineRep.lineNumberFormat = HFLineNumberFormatHexadecimal;
+
+ /* Add all our reps to the controller. */
+ [hex_controller addRepresenter:layoutRep];
+ [hex_controller addRepresenter:hexRep];
+ [hex_controller addRepresenter:asciiRep];
+ [hex_controller addRepresenter:scrollRep];
+ [hex_controller addRepresenter:lineRep];
+ [hex_controller addRepresenter:statusRep];
+
+ /* Tell the layout rep which reps it should lay out. */
+ [layoutRep addRepresenter:hexRep];
+ [layoutRep addRepresenter:scrollRep];
+ [layoutRep addRepresenter:asciiRep];
+ [layoutRep addRepresenter:lineRep];
+ [layoutRep addRepresenter:statusRep];
+
+
+ [(NSView *)[hexRep view] setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+
+ /* Grab the layout rep's view and stick it into our container. */
+ NSView *layoutView = [layoutRep view];
+ NSRect layoutViewFrame = self.memoryView.frame;
+ [layoutView setFrame:layoutViewFrame];
+ [layoutView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable | NSViewMaxYMargin];
+ [self.memoryView addSubview:layoutView];
+}
+
+ (BOOL)autosavesInPlace {
return YES;
}
@@ -333,6 +385,8 @@ static uint32_t rgbEncode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b)
NSString *nsstring = @(string); // For ref-counting
dispatch_async(dispatch_get_main_queue(), ^{
+ [hex_controller reloadData];
+
NSFont *font = [NSFont userFixedPitchFontOfSize:12];
NSUnderlineStyle underline = NSUnderlineStyleNone;
if (attributes & GB_LOG_BOLD) {
@@ -452,4 +506,44 @@ static uint32_t rgbEncode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b)
[self log:log withAttributes:0];
}
-@end
+- (uint8_t) readMemory:(uint16_t)addr
+{
+ while (!is_inited);
+ return GB_read_memory(&gb, addr);
+}
+
+- (void) writeMemory:(uint16_t)addr value:(uint8_t)value
+{
+ while (!is_inited);
+ GB_write_memory(&gb, addr, value);
+}
+
+- (void) performAtomicBlock: (void (^)())block
+{
+ while (!is_inited);
+ bool was_running = running;
+ if (was_running) {
+ [self stop];
+ }
+ block();
+ if (was_running) {
+ [self start];
+ }
+}
+
+- (void) reloadMemoryView
+{
+ if (self.memoryWindow.isVisible) {
+ [hex_controller reloadData];
+ }
+}
+
+- (IBAction) showMemory:(id)sender
+{
+ if (!hex_controller) {
+ [self initMemoryView];
+ }
+ [self.memoryWindow makeKeyAndOrderFront:sender];
+}
+
+@end
\ No newline at end of file
diff --git a/Cocoa/Document.xib b/Cocoa/Document.xib
index 472f71f..33357b6 100644
--- a/Cocoa/Document.xib
+++ b/Cocoa/Document.xib
@@ -10,6 +10,8 @@
+
+
@@ -113,5 +115,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Cocoa/GBCompleteByteSlice.h b/Cocoa/GBCompleteByteSlice.h
new file mode 100644
index 0000000..24f3ba0
--- /dev/null
+++ b/Cocoa/GBCompleteByteSlice.h
@@ -0,0 +1,7 @@
+#import "Document.h"
+#import "HexFiend/HexFiend.h"
+#import "HexFiend/HFByteSlice.h"
+
+@interface GBCompleteByteSlice : HFByteSlice
+- (instancetype) initWithByteArray:(HFByteArray *)array;
+@end
diff --git a/Cocoa/GBCompleteByteSlice.m b/Cocoa/GBCompleteByteSlice.m
new file mode 100644
index 0000000..44e7ee6
--- /dev/null
+++ b/Cocoa/GBCompleteByteSlice.m
@@ -0,0 +1,26 @@
+#import "GBCompleteByteSlice.h"
+
+@implementation GBCompleteByteSlice
+{
+ HFByteArray *_array;
+}
+
+- (instancetype) initWithByteArray:(HFByteArray *)array
+{
+ if ((self = [super init])) {
+ _array = array;
+ }
+ return self;
+}
+
+- (unsigned long long)length
+{
+ return [_array length];
+}
+
+- (void)copyBytes:(unsigned char *)dst range:(HFRange)range
+{
+ [_array copyBytes:dst range:range];
+}
+
+@end
diff --git a/Cocoa/GBMemoryByteArray.h b/Cocoa/GBMemoryByteArray.h
new file mode 100644
index 0000000..9599175
--- /dev/null
+++ b/Cocoa/GBMemoryByteArray.h
@@ -0,0 +1,7 @@
+#import "Document.h"
+#import "HexFiend/HexFiend.h"
+#import "HexFiend/HFByteArray.h"
+
+@interface GBMemoryByteArray : HFByteArray
+- (instancetype) initWithDocument:(Document *)document;
+@end
diff --git a/Cocoa/GBMemoryByteArray.m b/Cocoa/GBMemoryByteArray.m
new file mode 100644
index 0000000..8a8c1e8
--- /dev/null
+++ b/Cocoa/GBMemoryByteArray.m
@@ -0,0 +1,64 @@
+#import "GBMemoryByteArray.h"
+#import "GBCompleteByteSlice.h"
+
+
+@implementation GBMemoryByteArray
+{
+ Document *_document;
+}
+
+- (instancetype) initWithDocument:(Document *)document
+{
+ if ((self = [super init])) {
+ _document = document;
+ }
+ return self;
+}
+
+- (unsigned long long)length
+{
+ return 0x10000;
+}
+
+- (void)copyBytes:(unsigned char *)dst range:(HFRange)range
+{
+ uint16_t addr = (uint16_t) range.location;
+ unsigned long long length = range.length;
+ while (length) {
+ *(dst++) = [_document readMemory:addr++];
+ length--;
+ }
+}
+
+- (NSArray *)byteSlices
+{
+ return @[[[GBCompleteByteSlice alloc] initWithByteArray:self]];
+}
+
+- (HFByteArray *)subarrayWithRange:(HFRange)range
+{
+ unsigned char arr[range.length];
+ [self copyBytes:arr range:range];
+ HFByteArray *ret = [[HFBTreeByteArray alloc] init];
+ HFFullMemoryByteSlice *slice = [[HFFullMemoryByteSlice alloc] initWithData:[NSData dataWithBytes:arr length:range.length]];
+ [ret insertByteSlice:slice inRange:HFRangeMake(0, 0)];
+ return ret;
+}
+
+- (void)insertByteSlice:(HFByteSlice *)slice inRange:(HFRange)lrange
+{
+ if (slice.length != lrange.length) return; /* Insertion is not allowed, only overwriting. */
+ [_document performAtomicBlock:^{
+ uint8_t values[lrange.length];
+ [slice copyBytes:values range:HFRangeMake(0, lrange.length)];
+ uint16_t addr = (uint16_t) lrange.location;
+ uint8_t *src = values;
+ unsigned long long length = lrange.length;
+ while (length) {
+ [_document writeMemory:addr++ value:*(src++)];
+ length--;
+ }
+ }];
+}
+
+@end
diff --git a/Cocoa/License.html b/Cocoa/License.html
index 158c0a5..d064d29 100644
--- a/Cocoa/License.html
+++ b/Cocoa/License.html
@@ -18,12 +18,19 @@
font-size: 11px;
font-weight: normal;
}
+
+ h3 {
+ text-align:center;
+ font-size: 11px;
+ font-weight: bold;
+ }
-MIT License
-Copyright © 2015-2016 Lior Halphon
+SameBoy
+MIT License
+Copyright © 2015-2016 Lior Halphon
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -42,5 +49,32 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+Third-party Libraries
+HexFiend
+Copyright © 2005-2009, Peter Ammon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+
+- Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE