Synchronising mixal-mode with GNU MDK's latest release

Synchronising mixal-mode with GNU MDK's latest release

[jao]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

Tags: patch
thanks


Please find attached a patch that updates mixal-mode.el with latest
changes in GNU MDK.  I should have papers in place for emacs.

Do you think it'd be better if i just dropped that file from MDK's
tarball and maintain it by submitting patches here instead?

Thanks a lot!
jao


In GNU Emacs 28.0.50 (build 1, x86_64-pc-linux-gnu, cairo version 1.16.0)
 of 2020-10-16 built on osgiliath
Repository revision: 6a2f56db4e602372e33f35326a73cffa03586479
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12009000
System Description: Debian GNU/Linux bullseye/sid

Configured using:
 'configure --prefix=/usr/local/stow/emacs --with-x-toolkit=no
 --with-imagemagick'


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-mixal-mode-add-missed-instructions.patch --]
[-- Type: text/patch, Size: 3623 bytes --]

From 5bc3fbf661b895e665f7a07eb5b43d25bad83ad1 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" <jao@gnu.org>
Date: Fri, 16 Oct 2020 18:56:46 +0100
Subject: [PATCH] mixal-mode: add missed instructions

Synchronises with latest released GNU MDK 1.2.11

* mixal-mode.el (mixal-operation-codes-alist):
  Add missed instructions: SLB,SRB,JAE,JAO,JXE,JXO
---
 lisp/progmodes/mixal-mode.el | 42 ++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 468c116b67..9354af2085 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -5,7 +5,7 @@
 ;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Created: 09 Nov 2002
-;; Version: 0.1
+;; Version: 0.4
 ;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer Programming
 
 ;; This file is part of GNU Emacs.
@@ -45,6 +45,9 @@
 ;; Have fun.
 
 ;;; History:
+;; Version 0.4:
+;; 16/10/20: Jose A Ortega Ruiz <jao@gnu.org>
+;;           Add missed instructions: SLB,SRB,JAE,JAO,JXE,JXO
 ;; Version 0.3:
 ;; 12/10/05: Stefan Monnier <monnier@iro.umontreal.ca>
 ;;           Use font-lock-syntactic-keywords to detect/mark comments.
@@ -683,6 +686,18 @@ mixal-operation-codes-alist
 been executed when there was no jump."
           1)
 
+    (JAE jump "jump A even" 40
+          "Jump if the content of rA is even.
+Register J is set to the value of the next instruction that would have
+been executed when there was no jump."
+          1)
+
+    (JAO jump "jump A odd" 40
+         "Jump if the content of rA is odd.
+Register J is set to the value of the next instruction that would have
+been executed when there was no jump."
+         1)
+
     (JXN jump "jump X negative" 47
          "Jump if the content of rX is negative.
 Register J is set to the value of the next instruction that would have
@@ -719,12 +734,24 @@ mixal-operation-codes-alist
 been executed when there was no jump."
           1)
 
-    (J1N jump "jump I1 negative" 41
-         "Jump if the content of rI1 is negative.
+    (JXE jump "jump X even" 47
+         "Jump if the content of rX is even.
+Register J is set to the value of the next instruction that would have
+been executed when there was no jump."
+         1)
+
+    (JXO jump "jump X odd" 47
+         "Jump if the content of rX is odd.
 Register J is set to the value of the next instruction that would have
 been executed when there was no jump."
          1)
 
+    (J1N jump "jump I1 negative" 41
+     "Jump if the content of rI1 is negative.
+Register J is set to the value of the next instruction that would have
+been executed when there was no jump."
+     1)
+
     (J1Z jump "jump I1 zero" 41
          "Jump if the content of rI1 is zero.
 Register J is set to the value of the next instruction that would have
@@ -950,7 +977,6 @@ mixal-operation-codes-alist
 Zeros will be added to the right."
           2)
 
-
     (SRAX miscellaneous "shift right AX" 6
           "Shift AX, M bytes right.
 Zeros will be added to the left."
@@ -966,6 +992,14 @@ mixal-operation-codes-alist
 The bytes that fall off to the right will be added to the left."
          2)
 
+    (SLB miscellaneous "shift left AX binary" 6
+         "Shift AX, M binary places left."
+         2)
+
+    (SRB miscellaneous "shift right AX binary" 6
+         "Shift AX, M binary places right."
+         2)
+
     (MOVE miscellaneous "move" 7 number
           "Move MOD words from M to the location stored in rI1."
           (+ 1 (* 2 number)))
-- 
2.28.0


[-- Attachment #3: Type: text/plain, Size: 134 bytes --]


-- 
They are ill discoverers that think there is no land, when they can
see nothing but sea. -Francis Bacon, philosopher (1561-1626)

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Stefan Kangas]

jao <jao@gnu.org> writes:

> Please find attached a patch that updates mixal-mode.el with latest
> changes in GNU MDK.  I should have papers in place for emacs.

Thanks!  The patch looks good to me.

I can only see one previous commit from you (marked
"Copyright-paperwork-exempt") in the git log, so I'll wait for someone
with access to verify the copyright status.  (OTOH, maybe it doesn't
matter since these changes are already assigned to the FSF via GNU MDK?)

> Do you think it'd be better if i just dropped that file from MDK's
> tarball and maintain it by submitting patches here instead?

I guess it depends on if your users can wait for the changes until the
next major Emacs release, or if you feel that it would be beneficial to
get the changes out there earlier than that.  Orthogonally, one could
perhaps consider if this should be distributed as a GNU ELPA package.

In all cases, it would be very helpful if you could submit patches here
when there are any changes.

> Thanks a lot!

Thanks for handling this very promptly!

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[jao]

Tags: patch
thanks

On Fri, Oct 16 2020, Stefan Kangas wrote:

> jao <jao@gnu.org> writes:
>
>> Please find attached a patch that updates mixal-mode.el with latest
>> changes in GNU MDK.  I should have papers in place for emacs.
>
> Thanks!  The patch looks good to me.

Excellent.

>
> I can only see one previous commit from you (marked
> "Copyright-paperwork-exempt") in the git log, so I'll wait for someone
> with access to verify the copyright status.  (OTOH, maybe it doesn't
> matter since these changes are already assigned to the FSF via GNU MDK?)

I do have access to fencepost and to the copyright file (sorry for being
lazy!).  Just checked, and i'm on file for "GUILE" and for 
"EMACS EMMS"... i am pretty sure that means EMACS /and/ EMMS, so i think
we're fine :)

>> Do you think it'd be better if i just dropped that file from MDK's
>> tarball and maintain it by submitting patches here instead?
>
> I guess it depends on if your users can wait for the changes until the
> next major Emacs release, or if you feel that it would be beneficial to
> get the changes out there earlier than that.  Orthogonally, one could
> perhaps consider if this should be distributed as a GNU ELPA package.

We release less frequently than Emacs, so i am guessing users (all three
of them!) will be fine either way.  On practical terms, GNU ELPA would
be my less preferred option, since it'd add yet another repo/project to
maintain.

> In all cases, it would be very helpful if you could submit patches here
> when there are any changes.

Yes, that's no problem.  I am not the original author of the mode, so
back in the day I didn't pay attention, but my elisp skills have
improved enough in the intervening 20 years and i'm happy to take care
of it now :)

Cheers,
jao
-- 
If you could kick in the pants the person responsible for most of your
trouble, you wouldn't sit for a month. — Theodore Roosevelt

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Lars Ingebrigtsen]

Stefan Kangas <stefan@marxist.se> writes:

> I can only see one previous commit from you (marked
> "Copyright-paperwork-exempt") in the git log, so I'll wait for someone
> with access to verify the copyright status. 

Jose's copyright paperwork is on file.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Sat, 17 Oct 2020 08:17:22 +0200
> Cc: bug-mdk@gnu.org, 44037@debbugs.gnu.org, jao <jao@gnu.org>
> 
> Stefan Kangas <stefan@marxist.se> writes:
> 
> > I can only see one previous commit from you (marked
> > "Copyright-paperwork-exempt") in the git log, so I'll wait for someone
> > with access to verify the copyright status. 
> 
> Jose's copyright paperwork is on file.

I'm not sure.  I don't understand the semantics of "EMACS EMMS", I
think it might mean the assignment is limited to EMMS.

I will ask the copyright clerk.

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

> I'm not sure.  I don't understand the semantics of "EMACS EMMS", I
> think it might mean the assignment is limited to EMMS.

I assumed that that was a list of things that were assigned, not a
subset.  For instance, there's entries like

GDB BINUTILS GLIBC

and

GCC GNULIB

and

AUTOCONF AUTOMAKE BINUTILS COREUTILS DejaGNU EMACS FINDUTILS GCC GMP GZIP GDB GLIBC MAKE MPFR TAR TEXINFO

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: stefan@marxist.se,  bug-mdk@gnu.org,  44037@debbugs.gnu.org,  jao@gnu.org
> Date: Sat, 17 Oct 2020 10:07:15 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > I'm not sure.  I don't understand the semantics of "EMACS EMMS", I
> > think it might mean the assignment is limited to EMMS.
> 
> I assumed that that was a list of things that were assigned, not a
> subset.  For instance, there's entries like
> 
> GDB BINUTILS GLIBC
> 
> and
> 
> GCC GNULIB
> 
> and
> 
> AUTOCONF AUTOMAKE BINUTILS COREUTILS DejaGNU EMACS FINDUTILS GCC GMP GZIP GDB GLIBC MAKE MPFR TAR TEXINFO

I prefer to be sure we don't misinterpret what that says.

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Stefan Kangas]

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

jao <jao@gnu.org> writes:

> We release less frequently than Emacs, so i am guessing users (all three
> of them!) will be fine either way.

OK, sounds good to me.

> Yes, that's no problem.  I am not the original author of the mode, so
> back in the day I didn't pay attention, but my elisp skills have
> improved enough in the intervening 20 years and i'm happy to take care
> of it now :)

Thanks!  Should you want to make it more official, feel free to send a
patch to update the "Maintainer" field with your name and email address.

BTW, we are trying to push to convert code to use the new lexical scope.
If you find some time, it would be great if you could test the attached
patch that enables it for mixal-mode.el.  (It would be hard for me to
verify that it works since I don't use GNU MDK myself.)

[-- Attachment #2: 0001-lisp-progmodes-mixal-mode.el-Use-lexical-binding.patch --]
[-- Type: text/x-diff, Size: 726 bytes --]

From 2f77be1207eedcbb7008db4f8d513bf25a4ad7db Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 17 Oct 2020 15:52:01 +0200
Subject: [PATCH] * lisp/progmodes/mixal-mode.el: Use lexical-binding.

---
 lisp/progmodes/mixal-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 468c116b67..6691074ac8 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1,4 +1,4 @@
-;;; mixal-mode.el --- Major mode for the mix asm language.
+;;; mixal-mode.el --- Major mode for the mix asm language.  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
-- 
2.28.0

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[jao]

[-- Attachment #1: Type: text/plain, Size: 887 bytes --]


On Sat, Oct 17 2020, Eli Zaretskii wrote:

>> From: Lars Ingebrigtsen <larsi@gnus.org>
>> Cc: stefan@marxist.se,  bug-mdk@gnu.org,  44037@debbugs.gnu.org,  jao@gnu.org
>> Date: Sat, 17 Oct 2020 10:07:15 +0200
>>
>> Eli Zaretskii <eliz@gnu.org> writes:
>>
>> > I'm not sure.  I don't understand the semantics of "EMACS EMMS", I
>> > think it might mean the assignment is limited to EMMS.
>>
>> I assumed that that was a list of things that were assigned, not a
>> subset.  For instance, there's entries like
>>
>> GDB BINUTILS GLIBC
>>
>> and
>>
>> GCC GNULIB
>>
>> and
>>
>> AUTOCONF AUTOMAKE BINUTILS COREUTILS DejaGNU EMACS FINDUTILS GCC GMP GZIP GDB GLIBC MAKE MPFR TAR TEXINFO
>
> I prefer to be sure we don't misinterpret what that says.

FWIW, i've checked my archives and i do have separate PDFs with
assignments for EMMS and EMACS.  Happy to send them off-list if you need
to.


[-- Attachment #2: Type: image/png, Size: 63199 bytes --]

[-- Attachment #3: Type: text/plain, Size: 14 bytes --]



Thanks!
jao

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Eli Zaretskii]

> From: jao <jao@gnu.org>
> Cc: "Lars Ingebrigtsen" <larsi@gnus.org>,  <stefan@marxist.se>,
>   <bug-mdk@gnu.org>,  <44037@debbugs.gnu.org>
> Date: Sat, 17 Oct 2020 16:21:52 +0100
> 
> > I prefer to be sure we don't misinterpret what that says.
> 
> FWIW, i've checked my archives and i do have separate PDFs with
> assignments for EMMS and EMACS.  Happy to send them off-list if you need
> to.

No, this information is enough for me, thanks.  Your changes can be
installed.

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Stefan Kangas]

close 44037 28.1
thanks

Eli Zaretskii <eliz@gnu.org> writes:

>> FWIW, i've checked my archives and i do have separate PDFs with
>> assignments for EMMS and EMACS.  Happy to send them off-list if you need
>> to.
>
> No, this information is enough for me, thanks.  Your changes can be
> installed.

Pushed to master as commit 9513aa8f48.

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[jao]

[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]

On Sat, Oct 17 2020, Stefan Kangas wrote:

[...]

>> Yes, that's no problem.  I am not the original author of the mode, so
>> back in the day I didn't pay attention, but my elisp skills have
>> improved enough in the intervening 20 years and i'm happy to take care
>> of it now :)
>
> Thanks!  Should you want to make it more official, feel free to send a
> patch to update the "Maintainer" field with your name and email address.

Sure, patch attached.

> BTW, we are trying to push to convert code to use the new lexical scope.
> If you find some time, it would be great if you could test the attached
> patch that enables it for mixal-mode.el.  (It would be hard for me to
> verify that it works since I don't use GNU MDK myself.)

I've played with it a bit and there's no obvious problem with the switch
(this is just a mode for an assembly-like language without fancy
stuff).  Please feel free to install the patch.

Thanks,
jao
-- 
"I didn't do it, and I'll never do it again."
 -Derrik Weeks


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Set-jao-gnu.org-as-maintainer-of-mixal-mode.el.patch --]
[-- Type: text/x-diff, Size: 842 bytes --]

From b93cd45f3c2a044d82bb45c9b0a57ab51862259d Mon Sep 17 00:00:00 2001
From: Jose A Ortega Ruiz <jao@gnu.org>
Date: Sat, 17 Oct 2020 22:58:21 +0100
Subject: [PATCH] Set jao@gnu.org as maintainer of mixal-mode.el

---
 lisp/progmodes/mixal-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 9354af2085..92389c5a62 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
 ;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
-;; Maintainer: emacs-devel@gnu.org
+;; Maintainer: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Created: 09 Nov 2002
 ;; Version: 0.4
 ;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer Programming
-- 
2.28.0

bug#44037: Synchronising mixal-mode with GNU MDK's latest release

[Stefan Kangas]

jao <jao@gnu.org> writes:

>> Thanks!  Should you want to make it more official, feel free to send a
>> patch to update the "Maintainer" field with your name and email address.
>
> Sure, patch attached.

Excellent!  Pushed to master as commit 20728195b6.

>> BTW, we are trying to push to convert code to use the new lexical scope.
>> If you find some time, it would be great if you could test the attached
>> patch that enables it for mixal-mode.el.  (It would be hard for me to
>> verify that it works since I don't use GNU MDK myself.)
>
> I've played with it a bit and there's no obvious problem with the switch
> (this is just a mode for an assembly-like language without fancy
> stuff).  Please feel free to install the patch.

Thanks for testing; pushed to master as commit 3b5a43f3d7.