Skip to content

A collection of minor improvements #23

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

Merged
merged 6 commits into from
Dec 27, 2023
Merged

A collection of minor improvements #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d45b85f
added more python types + formatting
hugsy Dec 14, 2023
a0ce11b
stuff
hugsy Dec 14, 2023
32aeae5
added comments to default callbacks
hugsy Dec 14, 2023
0560263
use __get/setitem__ to get the session convenience variables
hugsy Dec 15, 2023
7078e83
formatting
hugsy Dec 19, 2023
4f1f6af
Merge branch 'main' into minor_improvements
hugsy Dec 27, 2023
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
4 changes: 2 additions & 2 deletions python/bochscpu/_bochscpu/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ class Session:
Set the auxiliary variable array
"""
...
def set_auxiliary_variable(self, index: int, value: int) -> bool:
def set_auxiliary_variable(self, index: int, value: int) -> None:
"""
Set an auxiliary variable
"""
Expand All @@ -967,7 +967,7 @@ class Session:
Get an auxiliary variable
"""
...
def __setitem__(self, index: int, value: int) -> bool:
def __setitem__(self, index: int, value: int) -> None:
"""
Alias for `set_auxiliary_variable`
"""
Expand Down
14 changes: 8 additions & 6 deletions python/src/bochscpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include <nanobind/stl/list.h>
#include <nanobind/stl/vector.h>

#include <string>


namespace nb = nanobind;
using namespace nb::literals;
Expand Down Expand Up @@ -344,10 +346,10 @@ NB_MODULE(_bochscpu, m)
"set_auxiliary_variable",
[](BochsCPU::Session& s, size_t idx, uint64_t val)
{
if ( idx > BochsCPU::Session::MaxAuxiliaryVariables )
return false;
if ( idx >= BochsCPU::Session::MaxAuxiliaryVariables )
throw std::out_of_range(
"Invalid range, maximum index is " + std::to_string(BochsCPU::Session::MaxAuxiliaryVariables));
s.auxiliaries[idx] = val;
return true;
})
.def(
"__getitem__",
Expand All @@ -359,10 +361,10 @@ NB_MODULE(_bochscpu, m)
"__setitem__",
[](BochsCPU::Session& s, size_t idx, uint64_t val)
{
if ( idx > BochsCPU::Session::MaxAuxiliaryVariables )
return false;
if ( idx >= BochsCPU::Session::MaxAuxiliaryVariables )
throw std::out_of_range(
"Invalid range, maximum index is " + std::to_string(BochsCPU::Session::MaxAuxiliaryVariables));
s.auxiliaries[idx] = val;
return true;
})
.def(
"run",
Expand Down