diff --git a/.gitmodules b/.gitmodules index 17e51d523..b85aa582d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "third_party/wslay"] path = third_party/wslay url = https://github.com/benvanik/wslay.git +[submodule "third_party/jansson"] + path = third_party/jansson + url = https://github.com/akheron/jansson.git diff --git a/debugger/assets/ui/code/code-tab.html b/debugger/assets/ui/code/code-tab.html index 48388c9c4..d5929bbc4 100644 --- a/debugger/assets/ui/code/code-tab.html +++ b/debugger/assets/ui/code/code-tab.html @@ -1,4 +1,4 @@ -
+
debug header/toolbar/etc
diff --git a/debugger/assets/ui/code/code-tab.js b/debugger/assets/ui/code/code-tab.js new file mode 100644 index 000000000..55fb8e14b --- /dev/null +++ b/debugger/assets/ui/code/code-tab.js @@ -0,0 +1,32 @@ +/** + ****************************************************************************** + * Xenia : Xbox 360 Emulator Research Project * + ****************************************************************************** + * Copyright 2013 Ben Vanik. All rights reserved. * + * Released under the BSD license - see LICENSE in the root for more details. * + ****************************************************************************** + */ + +'use strict'; + +var module = angular.module('xe.ui.code', [ + 'xe.log', + 'xe.session' +]); + + +module.controller('CodeTabController', function( + $rootScope, $scope, app, log) { + + $rootScope.$on('refresh', function() { + var dataSource = app.session.dataSource; + + dataSource.getModuleList().then(function(list) { + console.log(list); + }, function(e) { + log('Unable to fetch module list'); + }); + + console.log('refresh'); + }); +}); diff --git a/debugger/assets/ui/navbar.html b/debugger/assets/ui/navbar.html index 9c94802d1..3539d379a 100644 --- a/debugger/assets/ui/navbar.html +++ b/debugger/assets/ui/navbar.html @@ -13,12 +13,15 @@
  • - - + diff --git a/debugger/assets/ui/navbar.js b/debugger/assets/ui/navbar.js index a96f64d4d..4ae3bcde2 100644 --- a/debugger/assets/ui/navbar.js +++ b/debugger/assets/ui/navbar.js @@ -13,9 +13,13 @@ var module = angular.module('xe.ui.navbar', []); module.controller('NavbarController', function( - $scope, $state, app, log) { + $rootScope, $scope, $state, app, log) { - $scope.connectClicked = function() { + $scope.refresh = function() { + $rootScope.$emit('refresh'); + }; + + $scope.connect = function() { // TODO(benvanik): show a fancy dialog or something. var oldSession = app.session; app.connect().then(function(session) { @@ -34,7 +38,7 @@ module.controller('NavbarController', function( }); }; - $scope.openClicked = function() { + $scope.open = function() { var inputEl = document.createElement('input'); inputEl.type = 'file'; inputEl.accept = '.xe-trace,application/x-extension-xe-trace'; diff --git a/debugger/index.html b/debugger/index.html index 76e2d1fec..ff21331d1 100644 --- a/debugger/index.html +++ b/debugger/index.html @@ -31,6 +31,7 @@ + diff --git a/debugger/src/app.js b/debugger/src/app.js index e7b3eceeb..f345f7867 100644 --- a/debugger/src/app.js +++ b/debugger/src/app.js @@ -17,6 +17,7 @@ var module = angular.module('app', [ 'xe.log', 'xe.router', 'xe.session', + 'xe.ui.code', 'xe.ui.console', 'xe.ui.navbar' ]); diff --git a/debugger/src/datasources.js b/debugger/src/datasources.js index f24d8dd51..e7bc13a55 100644 --- a/debugger/src/datasources.js +++ b/debugger/src/datasources.js @@ -12,20 +12,88 @@ var module = angular.module('xe.datasources', []); -var DataSource = function(source) { - this.source = source; - this.online = false; - this.status = 'disconnected'; -}; -DataSource.prototype.open = function() {}; -DataSource.prototype.dispose = function() {}; +module.service('DataSource', function($q) { + var DataSource = function(source) { + this.source = source; + this.online = false; + this.status = 'disconnected'; + }; + DataSource.prototype.open = function() {}; + DataSource.prototype.dispose = function() {}; + DataSource.prototype.issue = function(command) {}; + DataSource.prototype.addBreakpoint = function(breakpoint) { + return this.addBreakpoints([breakpoint]); + }; -module.service('RemoteDataSource', function($q) { + DataSource.prototype.addBreakpoints = function(breakpoints) { + if (!breakpoints.length) { + var d = $q.defer(); + d.resolve(); + return d.promise; + } + return this.issue({ + command: 'cpu.add_breakpoints', + breakpoints: breakpoints.map(function(breakpoint) { + return breakpoint.toJSON(); + }) + }); + }; + + DataSource.prototype.removeBreakpoint = function(breakpointId) { + return this.removeBreakpoints([breakpointId]); + }; + + DataSource.prototype.removeBreakpoints = function(breakpointIds) { + return this.issue({ + command: 'cpu.remove_breakpoints', + breakpointIds: breakpointIds + }); + }; + + DataSource.prototype.removeAllBreakpoints = function() { + return this.issue({ + command: 'cpu.remove_all_breakpoints' + }); + }; + + DataSource.prototype.getModuleList = function() { + return this.issue({ + command: 'cpu.get_module_list' + }); + }; + + DataSource.prototype.getModule = function(moduleId) { + return this.issue({ + command: 'cpu.get_module', + moduleId: moduleId + }); + }; + + DataSource.prototype.getFunctionList = function(moduleId) { + return this.issue({ + command: 'cpu.get_function_list', + moduleId: moduleId + }); + }; + + DataSource.prototype.getFunction = function(address) { + return this.issue({ + command: 'cpu.get_function', + address: address + }); + }; + + return DataSource; +}); + +module.service('RemoteDataSource', function($q, DataSource) { var RemoteDataSource = function(url) { DataSource.call(this, url); this.url = url; this.socket = null; + this.nextRequestId_ = 1; + this.pendingRequests_ = {}; }; inherits(RemoteDataSource, DataSource); @@ -62,12 +130,28 @@ module.service('RemoteDataSource', function($q) { this.socket.onmessage = (function(e) { console.log('message', e.data); + var json = JSON.parse(e.data); + if (json.requestId) { + // Response to a previous request. + var request = this.pendingRequests_[json.requestId]; + if (request) { + delete this.pendingRequests_[json.requestId]; + if (json.status) { + request.deferred.resolve(json.result); + } else { + request.deferred.reject(json.result); + } + } + } else { + // Notification. + } }).bind(this); return d.promise; }; RemoteDataSource.prototype.dispose = function() { + this.pendingRequests_ = {}; this.online = false; this.status = 'disconnected'; if (this.socket) { @@ -77,11 +161,20 @@ module.service('RemoteDataSource', function($q) { DataSource.prototype.dispose.call(this); }; + RemoteDataSource.prototype.issue = function(command) { + var d = $q.defer(); + command.requestId = this.nextRequestId_++; + this.socket.send(JSON.stringify(command)); + command.deferred = d; + this.pendingRequests_[command.requestId] = command; + return d.promise; + }; + return RemoteDataSource; }); -module.service('FileDataSource', function($q) { +module.service('FileDataSource', function($q, DataSource) { var FileDataSource = function(file) { DataSource.call(this, file.name); this.file = file; diff --git a/src/xenia/debug/protocols/ws/ws_client.cc b/src/xenia/debug/protocols/ws/ws_client.cc index 724253314..71b1b3645 100644 --- a/src/xenia/debug/protocols/ws/ws_client.cc +++ b/src/xenia/debug/protocols/ws/ws_client.cc @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -133,10 +134,10 @@ void WSClientOnMsgCallback(wslay_event_context_ptr ctx, WSClient* client = reinterpret_cast(user_data); switch (arg->opcode) { case WSLAY_TEXT_FRAME: - XELOGW("Text frame ignored; use binary messages"); + client->OnMessage(arg->msg, arg->msg_length); break; case WSLAY_BINARY_FRAME: - //client->OnMessage(arg->msg, arg->msg_length); + // Ignored. break; default: // Unknown opcode - some frame stuff? @@ -371,7 +372,18 @@ void WSClient::EventThread() { delete this; } -void WSClient::Write(uint8_t** buffers, size_t* lengths, size_t count) { +void WSClient::Write(const char* value) { + const uint8_t* buffers[] = { + (uint8_t*)value, + }; + size_t lengths[] = { + sizeof(char) * xestrlena(value), + }; + Write(buffers, lengths, XECOUNT(buffers), false); +} + +void WSClient::Write(const uint8_t** buffers, size_t* lengths, size_t count, + bool binary) { if (!count) { return; } @@ -400,7 +412,7 @@ void WSClient::Write(uint8_t** buffers, size_t* lengths, size_t count) { } struct wslay_event_msg msg = { - WSLAY_BINARY_FRAME, + binary ? WSLAY_BINARY_FRAME : WSLAY_TEXT_FRAME, combined_buffer, combined_length, }; @@ -415,3 +427,84 @@ void WSClient::Write(uint8_t** buffers, size_t* lengths, size_t count) { xe_socket_loop_set_queued_write(loop_); } } + +void WSClient::OnMessage(const uint8_t* data, size_t length) { + // + const char* s = (const char*)data; + printf(s); + // command + // requestId + + json_error_t error; + json_t* request = json_loadb( + (const char*)data, length, JSON_DECODE_INT_AS_REAL, &error); + if (!request) { + // Failed to parse. + XELOGE("Failed to parse JSON request: %d:%d %s %s", + error.line, error.column, + error.source, error.text); + return; + } + if (!json_is_object(request)) { + XELOGE("Expected JSON object"); + json_decref(request); + return; + } + + json_t* request_id_json = json_object_get(request, "requestId"); + if (!request_id_json || !json_is_number(request_id_json)) { + XELOGE("Need requestId field"); + json_decref(request); + return; + } + json_t* command_json = json_object_get(request, "command"); + if (!command_json || !json_is_string(command_json)) { + XELOGE("Need command field"); + json_decref(request); + return; + } + + // Handle command. + bool succeeded = false; + const char* command = json_string_value(command_json); + json_t* result_json = HandleMessage(command, request, succeeded); + if (!result_json) { + result_json = json_null(); + } + + // Prepare response. + json_t* response = json_object(); + json_object_set(response, "requestId", request_id_json); + json_t* status_json = succeeded ? json_true() : json_false(); + json_object_set_new(response, "status", status_json); + json_object_set_new(response, "result", result_json); + + // Encode response to string and send back. + const char* response_string = json_dumps(response, JSON_INDENT(2)); + Write(response_string); + + json_decref(request); + json_decref(response); +} + +json_t* WSClient::HandleMessage(const char* command, json_t* request, + bool& succeeded) { + succeeded = false; + + // Get target. + char target_name[16] = { 0 }; + const char* dot = xestrchra(command, '.'); + if (dot) { + if (dot - command > XECOUNT(target_name)) { + return NULL; + } + xestrncpya(target_name, XECOUNT(target_name), + command, dot - command); + } + const char* sub_command = command + (dot - command + 1); + + // Lookup target and dispatch. + + succeeded = true; + return json_null(); +} diff --git a/src/xenia/debug/protocols/ws/ws_client.h b/src/xenia/debug/protocols/ws/ws_client.h index 09deae39a..128c94831 100644 --- a/src/xenia/debug/protocols/ws/ws_client.h +++ b/src/xenia/debug/protocols/ws/ws_client.h @@ -19,6 +19,7 @@ struct wslay_event_msg; +struct json_t; namespace xe { @@ -37,7 +38,12 @@ public: virtual int Setup(); virtual void Close(); - void Write(uint8_t** buffers, size_t* lengths, size_t count); + void Write(const char* value); + void Write(const uint8_t** buffers, size_t* lengths, size_t count, + bool binary = true); + + void OnMessage(const uint8_t* data, size_t length); + json_t* HandleMessage(const char* command, json_t* request, bool& succeeded); private: static void StartCallback(void* param); diff --git a/third_party/jansson b/third_party/jansson new file mode 160000 index 000000000..4e8c4bfbd --- /dev/null +++ b/third_party/jansson @@ -0,0 +1 @@ +Subproject commit 4e8c4bfbd209e50cc7b13993bbd56adb9282c465 diff --git a/third_party/jansson.gypi b/third_party/jansson.gypi new file mode 100644 index 000000000..17559564d --- /dev/null +++ b/third_party/jansson.gypi @@ -0,0 +1,59 @@ +# Copyright 2013 Ben Vanik. All Rights Reserved. +{ + 'targets': [ + { + 'target_name': 'jansson', + 'type': '<(library)', + + 'direct_dependent_settings': { + 'include_dirs': [ + 'jansson/win32/', + 'jansson/src/', + ], + + 'defines': [ + ], + }, + + 'msvs_disabled_warnings': [4267], + + 'defines': [ + ], + + 'conditions': [ + ['OS != "win"', { + 'defines': [ + ], + }], + ['OS == "win"', { + 'defines': [ + ], + }], + ], + + 'include_dirs': [ + 'jansson/win32/', + 'jansson/src/', + ], + + 'sources': [ + 'jansson/win32/jansson_config.h', + 'jansson/src/dump.c', + 'jansson/src/error.c', + 'jansson/src/hashtable.c', + 'jansson/src/hashtable.h', + 'jansson/src/jansson.h', + 'jansson/src/jansson_private.h', + 'jansson/src/load.c', + 'jansson/src/memory.c', + 'jansson/src/pack_unpack.c', + 'jansson/src/strbuffer.c', + 'jansson/src/strbuffer.h', + 'jansson/src/strconv.c', + 'jansson/src/utf.c', + 'jansson/src/utf.h', + 'jansson/src/value.c', + ], + } + ] +} diff --git a/xenia.gyp b/xenia.gyp index 133913ff9..848abc69f 100644 --- a/xenia.gyp +++ b/xenia.gyp @@ -5,6 +5,7 @@ 'third_party/asmjit.gypi', 'third_party/beaengine.gypi', 'third_party/gflags.gypi', + 'third_party/jansson.gypi', 'third_party/sparsehash.gypi', 'third_party/wslay.gypi', ], @@ -249,6 +250,7 @@ 'asmjit', 'beaengine', 'gflags', + 'jansson', 'wslay', 'alloy', ], @@ -256,6 +258,7 @@ 'asmjit', 'beaengine', 'gflags', + 'jansson', 'wslay', 'alloy', ],