diff --git a/Epreuve3.py b/Epreuve3.py index f6876d0..68ca609 100644 --- a/Epreuve3.py +++ b/Epreuve3.py @@ -70,12 +70,10 @@ class Simulator: extra_cycles = 0 # pour LDR/STR/TIM # --- instructions 2 octets à opcode fixe --- - #print(pc_before) - #print(self.program_size) - if c.after_ret: - instr = f"DB 0x{b:02X}" + #if c.after_ret: + # instr = f"DB 0x{b:02X}" - elif b == 0x00: # CALL _label + if b == 0x00: # CALL _label addr = self.fetch_byte() size = 2 instr = f"CALL {addr}" @@ -206,14 +204,10 @@ class Simulator: pause_ms = mult * (v + 1) c.cycles += pause_ms # modélisation de la pause - # if pc_before >= self.program_size: - # if 32 <= b <= 126: - # instr = f"DB 0x{b:02X} ('{chr(b)}')" - # else: - # instr = f"DB 0x{b:02X}" else: - instr = f"UNKNOWN 0x{b:02X}" - c.running = False + instr = f"DB 0x{b:02X}" + # instr = f"UNKNOWN 0x{b:02X}" + # c.running = False diff --git a/test_bin_epreuve3/call_label.bin b/test_bin_epreuve3/call_label.bin index a223f50..5b92d77 100644 Binary files a/test_bin_epreuve3/call_label.bin and b/test_bin_epreuve3/call_label.bin differ diff --git a/test_bin_epreuve3/cmp_val.bin b/test_bin_epreuve3/cmp_val.bin index b183244..e1640aa 100644 --- a/test_bin_epreuve3/cmp_val.bin +++ b/test_bin_epreuve3/cmp_val.bin @@ -1 +1 @@ -azBX09 \ No newline at end of file +azBX09 \ No newline at end of file diff --git a/test_bin_epreuve3/db1.bin b/test_bin_epreuve3/db1.bin index 137b09d..23c340b 100644 Binary files a/test_bin_epreuve3/db1.bin and b/test_bin_epreuve3/db1.bin differ diff --git a/test_bin_epreuve3/db2.bin b/test_bin_epreuve3/db2.bin index e85d5b4..5f69d72 100644 --- a/test_bin_epreuve3/db2.bin +++ b/test_bin_epreuve3/db2.bin @@ -1 +1 @@ -abcdefghijklmnopqrstuvwxyz \ No newline at end of file +abcdefghijklmnopqrstuvwxyz \ No newline at end of file diff --git a/test_bin_epreuve3/db3.bin b/test_bin_epreuve3/db3.bin index a6860d9..4d5ee4e 100644 --- a/test_bin_epreuve3/db3.bin +++ b/test_bin_epreuve3/db3.bin @@ -1 +1 @@ -ABCDEFGHIJKLMNOPQRSTUVWXYZ \ No newline at end of file +ABCDEFGHIJKLMNOPQRSTUVWXYZ \ No newline at end of file diff --git a/test_bin_epreuve3/db4.bin b/test_bin_epreuve3/db4.bin index ad47100..309392f 100644 --- a/test_bin_epreuve3/db4.bin +++ b/test_bin_epreuve3/db4.bin @@ -1 +1 @@ -0123456789 \ No newline at end of file +0123456789 \ No newline at end of file diff --git a/test_bin_epreuve3/jeq_label.bin b/test_bin_epreuve3/jeq_label.bin index 2cbf7d2..da7e1d9 100644 Binary files a/test_bin_epreuve3/jeq_label.bin and b/test_bin_epreuve3/jeq_label.bin differ diff --git a/test_bin_epreuve3/jlt_label.bin b/test_bin_epreuve3/jlt_label.bin index 63bbe01..66c8c0d 100644 Binary files a/test_bin_epreuve3/jlt_label.bin and b/test_bin_epreuve3/jlt_label.bin differ diff --git a/test_bin_epreuve3/jmp_label.bin b/test_bin_epreuve3/jmp_label.bin index d0ecd95..ebf59a1 100644 Binary files a/test_bin_epreuve3/jmp_label.bin and b/test_bin_epreuve3/jmp_label.bin differ diff --git a/test_bin_epreuve3/ldr_label.bin b/test_bin_epreuve3/ldr_label.bin index dcbedf9..ff695d7 100644 Binary files a/test_bin_epreuve3/ldr_label.bin and b/test_bin_epreuve3/ldr_label.bin differ diff --git a/test_bin_epreuve3/mov_reg.bin b/test_bin_epreuve3/mov_reg.bin index bc3d563..34ab926 100644 --- a/test_bin_epreuve3/mov_reg.bin +++ b/test_bin_epreuve3/mov_reg.bin @@ -1 +1 @@ -PQRSTUVWXYZ[\]^_ \ No newline at end of file +PQRSTUVWXYZ[\]^_ \ No newline at end of file diff --git a/test_bin_epreuve3/mov_val.bin b/test_bin_epreuve3/mov_val.bin index 1a8aede..26a05f6 100644 --- a/test_bin_epreuve3/mov_val.bin +++ b/test_bin_epreuve3/mov_val.bin @@ -1 +1 @@ -azBX09 \ No newline at end of file +azBX09 \ No newline at end of file diff --git a/test_bin_epreuve3/out.bin b/test_bin_epreuve3/out.bin index d96c762..4aaac42 100644 --- a/test_bin_epreuve3/out.bin +++ b/test_bin_epreuve3/out.bin @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/test_bin_epreuve3/pop.bin b/test_bin_epreuve3/pop.bin index ddadce8..22c982c 100644 --- a/test_bin_epreuve3/pop.bin +++ b/test_bin_epreuve3/pop.bin @@ -1 +1 @@ -`abc \ No newline at end of file +`abc \ No newline at end of file diff --git a/test_bin_epreuve3/str_label.bin b/test_bin_epreuve3/str_label.bin index 2e2e047..86b4802 100644 Binary files a/test_bin_epreuve3/str_label.bin and b/test_bin_epreuve3/str_label.bin differ diff --git a/test_bin_epreuve3/sub_reg.bin b/test_bin_epreuve3/sub_reg.bin index f86b4cd..df06edf 100644 --- a/test_bin_epreuve3/sub_reg.bin +++ b/test_bin_epreuve3/sub_reg.bin @@ -1 +1 @@ - \ No newline at end of file +߀ \ No newline at end of file diff --git a/test_bin_epreuve3/sub_val.bin b/test_bin_epreuve3/sub_val.bin index 6e1a122..f915c71 100644 --- a/test_bin_epreuve3/sub_val.bin +++ b/test_bin_epreuve3/sub_val.bin @@ -1 +1 @@ -azBX09 \ No newline at end of file +azBX09 \ No newline at end of file diff --git a/test_bin_epreuve3/tim.bin b/test_bin_epreuve3/tim.bin index 3a5ceab..557ec28 100644 Binary files a/test_bin_epreuve3/tim.bin and b/test_bin_epreuve3/tim.bin differ