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

2020-10-16 Thread jao
Tags: patch
thanks

On Fri, Oct 16 2020, Stefan Kangas wrote:

> jao  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



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

2020-10-16 Thread Stefan Kangas
jao  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!



Synchronising mixal-mode with GNU MDK's latest release

2020-10-16 Thread jao
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'

>From 5bc3fbf661b895e665f7a07eb5b43d25bad83ad1 Mon Sep 17 00:00:00 2001
From: "Jose A. Ortega Ruiz" 
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 
 ;; Maintainer: emacs-de...@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 
+;;   Add missed instructions: SLB,SRB,JAE,JAO,JXE,JXO
 ;; Version 0.3:
 ;; 12/10/05: Stefan Monnier 
 ;;   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


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


Merge misc/mixal-mode.el with version in Emacs

2020-10-16 Thread Stefan Kangas
I see that there are some changes in your misc/mixal-mode.el that are
not in the version distributed with GNU Emacs.

I suggest to merge all relevant changes from Emacs into your version and
submitting either an updated file that can be part of Emacs 28.1, or
even better a patch.

Thanks.