Sourcery refactored master branch #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| @@ -8,7 +8,6 @@ | |||
|
|
|||
| try: | |||
| t.halt() | |||
| pass | |||
There was a problem hiding this comment.
Lines 11-11 refactored with the following changes:
- Remove redundant pass statement (
remove-redundant-pass)
Comment on lines
-7
to
+8
| registers = [] | ||
| register_list = ["eax", "ebx", "ecx", "edx", "esi", "edi", "ebp", "esp", "eip"] | ||
| for reg in register_list: | ||
| registers.append((reg, thread.arch_register(reg))) | ||
| return registers | ||
| return [(reg, thread.arch_register(reg)) for reg in register_list] |
There was a problem hiding this comment.
Function get_registers refactored with the following changes:
- Move assignment closer to its usage within a block (
move-assign-in-block) - Convert for loop into list comprehension (
list-comprehension) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-16
to
+13
|
|
There was a problem hiding this comment.
Function print_registers refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Comment on lines
-86
to
+83
| ret = t.mem(ss.ToHex() + ":" + reg("esp").ToHex(), 4) | ||
| ret = t.mem(f"{ss.ToHex()}:" + reg("esp").ToHex(), 4) |
There was a problem hiding this comment.
Function pop refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-169
to
+172
| segment = GDTEntry(t.memblock(str(base.ToUInt32() + 8 * idx.ToUInt32()) + "L", 8, 1)) | ||
| segment = GDTEntry( | ||
| t.memblock(f"{str(base.ToUInt32() + 8 * idx.ToUInt32())}L", 8, 1) | ||
| ) | ||
| limit = segment.limit | ||
| print("ESP : %s" % esp.ToHex()) | ||
| print(f"ESP : {esp.ToHex()}") | ||
| esp = esp & ~0xF | ||
| t.memdump(ss.ToHex() + ":" + esp.ToHex(), limit - esp, 1) | ||
| t.memdump(f"{ss.ToHex()}:{esp.ToHex()}", limit - esp, 1) |
There was a problem hiding this comment.
Function printStackContent refactored with the following changes:
- Use f-string instead of string concatenation [×3] (
use-fstring-for-concatenation) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| self.rpl = bits[0:1] | ||
| self.rpl = bits[:1] |
There was a problem hiding this comment.
Function Selector.__init__ refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index)
| self.limit = bits[0:15] | ||
| self.limit = bits[:15] |
There was a problem hiding this comment.
Function GDTEntry.__init__ refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index)
Comment on lines
-78
to
+83
| self.offset = bits[0:15] | ||
| self.offset = bits[:15] | ||
| self.offset.Append(bits[48:63]) | ||
| self.selector = bits[16:31] | ||
| self.zero = bits[32:39] | ||
| self.type_attr = bits[40:47] | ||
| self.gate_type = self.type_attr[0:3] | ||
| self.gate_type = self.type_attr[:3] |
There was a problem hiding this comment.
Function IDTEntry.__init__ refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] [×2] (
remove-redundant-slice-index)
Comment on lines
-118
to
+122
| segment = t.memblock(str(base.ToUInt32() + 8 * i) + "L", 8, 1) | ||
| if name == "IDT": | ||
| entry = IDTEntry(segment) | ||
| else: | ||
| entry = GDTEntry(segment) | ||
| segment = t.memblock(f"{str(base.ToUInt32() + 8 * i)}L", 8, 1) | ||
| entry = IDTEntry(segment) if name == "IDT" else GDTEntry(segment) | ||
| if entry.pr: | ||
| print("**** %s Entry %d ****" % (name, i)) | ||
| print("%s" % str(entry)) | ||
| print(f"{str(entry)}") |
There was a problem hiding this comment.
Function print_segment refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace if statement with if expression (
assign-if-exp) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Comment on lines
-156
to
+155
| segment = t.memblock(str(base.ToUInt32() + 8 * idx) + "L", 8, 1) | ||
| segment = t.memblock(f"{str(base.ToUInt32() + 8 * idx)}L", 8, 1) | ||
| entry = GDTEntry(segment) | ||
| if addr < entry.limit: | ||
| return entry.base_addr + addr | ||
| else: | ||
| return None | ||
| return entry.base_addr + addr if addr < entry.limit else None |
There was a problem hiding this comment.
Function segment_addr_to_linear refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace if statement with if expression (
assign-if-exp)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run:Help us improve this pull request!