diff --git a/guix/git/mes.scm b/guix/git/mes.scm index 35be5da6..76941a2d 100644 --- a/guix/git/mes.scm +++ b/guix/git/mes.scm @@ -90,7 +90,7 @@ get_machine.") (license gpl3+))) (define-public m2-planet - (let ((commit "c2cbc518f9c073436845cae2bdecf01ffdb1afbd") + (let ((commit "1fc2aeab483208bd2ba117b21df3894c182470ec") (revision "0")) (package (name "m2-planet") @@ -103,9 +103,10 @@ get_machine.") (file-name (git-file-name name version)) (sha256 (base32 - "0v8vcd5i4z904n5n2mxgd6jpz0gmgbfxmvwzg8ax6gy1js4jyixf")))) + "1fj3xiqcibdfi78b43nn6w8hs3vkz32yb06n8r5mna8pnjdmn00l")))) (native-inputs - `(("mescc-tools" ,mescc-tools))) + `(("gcc-toolchain" ,gcc-toolchain-7) + ("mescc-tools" ,mescc-tools))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) diff --git a/lib/m2/x86/x86_defs.M1 b/lib/m2/x86/x86_defs.M1 index ef081da6..9d7461fa 100644 --- a/lib/m2/x86/x86_defs.M1 +++ b/lib/m2/x86/x86_defs.M1 @@ -35,6 +35,7 @@ DEFINE COPY_esp_to_ebp 89E5 DEFINE COPY_esp_to_ecx 89E1 DEFINE COPY_esp_to_edi 89E7 DEFINE DIVIDE_eax_by_ebx_into_eax F7FB +DEFINE DIVIDES_eax_by_ebx_into_eax F7F3 DEFINE INT_80 CD80 DEFINE JUMP E9 DEFINE JUMP_EQ 0F84 @@ -56,11 +57,13 @@ DEFINE LOAD_INTEGER_ebx 8B1B DEFINE LOAD_INTEGER_ecx 8B09 DEFINE LOAD_INTEGER_edx 8B12 DEFINE MODULUS_eax_from_ebx_into_ebx F7FB +DEFINE MODULUSS_eax_from_ebx_into_ebx F7F3 DEFINE MOVEZBL 0FB6C0 DEFINE MOVE_ebx_to_eax 89D8 DEFINE MOVE_ecx_to_eax 89C8 DEFINE MOVE_edx_to_eax 89D0 -DEFINE MULTIPLY_eax_by_ebx_into_eax F7E3 +DEFINE MULTIPLY_eax_by_ebx_into_eax F7EB +DEFINE MULTIPLYS_eax_by_ebx_into_eax F7E3 DEFINE NOP 00000000 DEFINE NOT_eax F7D0 DEFINE OR_eax_ebx 09D8