Merge branch 'rh850-arch-fix-ci-new' into rh850-arch

quarkslab · Jan 22, 2024 · 77a09c0 · 77a09c0
2 parents 8eddd0f + 4b5387a
commit 77a09c0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/bindings/python/sample_rh850.py b/bindings/python/sample_rh850.py
@@ -51,11 +51,7 @@ def test_rh850():
         mu.hook_add(UC_HOOK_CODE, hook_code)
 
         # emulate machine code in infinite time
-<<<<<<< HEAD
-        mu.emu_start(ADDRESS, ADDRESS + len(RH850_CODE) - 1)
-=======
         mu.emu_start(ADDRESS, ADDRESS + len(RH850_CODE))
->>>>>>> 4abc05b3 (Removed hook-related code (causes some issues for now).)
 
         # now print out some registers
         print(">>> Emulation done. Below is the CPU context")