Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various IDE enhancements #56

Merged
merged 3 commits into from
Jan 28, 2025
Merged

Various IDE enhancements #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
956e129
Add cyan background for all nonzero reg values in the IDE
colby-nyce Jan 28, 2025
51c07c6
Add tab for trap/exception handling code to the IDE
colby-nyce Jan 28, 2025
0abf2b2
Add tab for trap/exception handling code to the IDE
colby-nyce Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions IDE/editor/test_debugger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,23 +112,30 @@ def __init__(self, parent, frame):
csr_names = [reg['name'] for reg in json.load(fin)]

self.regval_grids = {
'x': RegisterGrid(self, int_names),
'f': RegisterGrid(self, fp_names),
'x': RegisterGrid(self, int_names, color_nonzero=True),
'f': RegisterGrid(self, fp_names, color_nonzero=True),
'csr': RegisterGrid(self, csr_names)
}

cpp_notebook = wx.Notebook(self)

def AddTab(notebook, handler_subdir):
atlas_root = os.path.join(os.path.dirname(__file__), '..', '..')
handler_dir = os.path.join(atlas_root, 'core', 'inst_handlers', handler_subdir)
def AddTab(notebook, tab_name, handler_subdir=None, handler_file=None):
if handler_subdir is None and handler_file is None:
handler_subdir = tab_name

cpp_code = None
for handler_file in os.listdir(handler_dir):
if handler_file.endswith('.cpp'):
with open(os.path.join(handler_dir, handler_file), 'r') as fin:
cpp_code = fin.read()
break
if handler_subdir is not None:
atlas_root = os.path.join(os.path.dirname(__file__), '..', '..')
handler_dir = os.path.join(atlas_root, 'core', 'inst_handlers', handler_subdir)

cpp_code = None
for handler_file in os.listdir(handler_dir):
if handler_file.endswith('.cpp'):
with open(os.path.join(handler_dir, handler_file), 'r') as fin:
cpp_code = fin.read()
break
else:
with open(handler_file, 'r') as fin:
cpp_code = fin.read()

cpp_scrolled_panel = wx.lib.scrolledpanel.ScrolledPanel(notebook)
cpp_scrolled_panel.SetupScrolling()
Expand All @@ -147,7 +154,7 @@ def AddTab(notebook, handler_subdir):
cpp_scrolled_panel_sizer.Add(search_bar, 0, wx.EXPAND)
cpp_scrolled_panel.SetSizer(cpp_scrolled_panel_sizer)

notebook.AddPage(cpp_scrolled_panel, handler_subdir)
notebook.AddPage(cpp_scrolled_panel, tab_name)

AddTab(cpp_notebook, 'a')
AddTab(cpp_notebook, 'd')
Expand All @@ -157,6 +164,10 @@ def AddTab(notebook, handler_subdir):
AddTab(cpp_notebook, 'zicsr')
AddTab(cpp_notebook, 'zifencei')

atlas_root = os.path.join(os.path.dirname(__file__), '..', '..')
execute_cpp_file = os.path.join(atlas_root, 'core', 'Exception.cpp')
AddTab(cpp_notebook, 'trap', handler_file=execute_cpp_file)

hsizer = wx.BoxSizer(wx.HORIZONTAL)
hsizer.Add(self.regval_grids['x'])
hsizer.Add(self.regval_grids['f'])
Expand Down Expand Up @@ -249,9 +260,10 @@ def __OnCopy(self, event):
wx.TheClipboard.Close()

class RegisterGrid(wx.grid.Grid):
def __init__(self, parent, reg_names):
def __init__(self, parent, reg_names, color_nonzero=False):
wx.grid.Grid.__init__(self, parent)
self.reg_names = reg_names
self.color_nonzero = color_nonzero

self.CreateGrid(0, 2)
self.HideRowLabels()
Expand Down Expand Up @@ -300,6 +312,9 @@ def SetRegValues(self, snapshot):
if changes is not None and reg_name in snapshot.getChanges():
self.SetCellBackgroundColour(row, 0, 'yellow')
self.SetCellBackgroundColour(row, 1, 'yellow')
elif int(reg_val, 16) and self.color_nonzero:
self.SetCellBackgroundColour(row, 0, 'cyan')
self.SetCellBackgroundColour(row, 1, 'cyan')

self.ShowRow(row)

Expand Down
2 changes: 0 additions & 2 deletions core/Exception.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ namespace atlas

void Exception::handleUModeException_(atlas::AtlasState* state)
{
// TODO cnyce
(void)state;
sparta_assert(false, "Not implemented");
}

void Exception::handleSModeException_(atlas::AtlasState* state)
{
// TODO cnyce
(void)state;
sparta_assert(false, "Not implemented");
}
Expand Down