diff -Nru mdk-1.2.11+dfsg/ChangeLog mdk-1.3.0+dfsg/ChangeLog --- mdk-1.2.11+dfsg/ChangeLog 2020-10-15 20:03:28.000000000 +0000 +++ mdk-1.3.0+dfsg/ChangeLog 2020-10-31 04:18:00.000000000 +0000 @@ -1,5 +1,65 @@ +2020-10-31 Jose Antonio Ortega Ruiz + + NEWS for 1.3.0 + + New gendocs.sh version + +2020-10-20 Jose Antonio Ortega Ruiz + + Interface nits + +2020-10-19 Jose Antonio Ortega Ruiz + + goto address dialog + + Year range in --version messages + + Nit: Ctrl+q to quit + + Version bump + + First fully functional GTK3 + + Current line and breakpoint icons + + Gimme back my fonts (deprecated) + + Stock icon for quit app + + attach/detach buttons + +2020-10-18 Jose Antonio Ortega Ruiz + + mixgtk_widget_factory_get_by_name + + Show/hide toolbars + + Toolbars visible again + + gtk-builder-tool simplify + + Use g_error_free + + gtk_widget_reparent deprecation + + G_INLINE_FUNC deprecated + + Work in progress + + Mirgration to GTK+3: widget lookup fixes + + Mirgration to GTK+3: seemingly safe changes + + mixal-mode.el synchronised with emacs's + +2020-10-16 Jose Antonio Ortega Ruiz + + Doc versions updates + 2020-10-15 Jose Antonio Ortega Ruiz + Typo + Support for Guile 3.x NEWS updated diff -Nru mdk-1.2.11+dfsg/configure mdk-1.3.0+dfsg/configure --- mdk-1.2.11+dfsg/configure 2020-10-15 19:57:02.000000000 +0000 +++ mdk-1.3.0+dfsg/configure 2020-10-19 03:02:03.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU MDK 1.2.11. +# Generated by GNU Autoconf 2.69 for GNU MDK 1.3.0. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='GNU MDK' PACKAGE_TARNAME='mdk' -PACKAGE_VERSION='1.2.11' -PACKAGE_STRING='GNU MDK 1.2.11' +PACKAGE_VERSION='1.3.0' +PACKAGE_STRING='GNU MDK 1.3.0' PACKAGE_BUGREPORT='bug-mdk@gnu.org' PACKAGE_URL='http://www.gnu.org/software/mdk/' @@ -1388,7 +1388,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU MDK 1.2.11 to adapt to many kinds of systems. +\`configure' configures GNU MDK 1.3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1459,7 +1459,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU MDK 1.2.11:";; + short | recursive ) echo "Configuration of GNU MDK 1.3.0:";; esac cat <<\_ACEOF @@ -1583,7 +1583,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU MDK configure 1.2.11 +GNU MDK configure 1.3.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2189,7 +2189,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU MDK $as_me 1.2.11, which was +It was created by GNU MDK $as_me 1.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3056,7 +3056,7 @@ # Define the identity of the package. PACKAGE='mdk' - VERSION='1.2.11' + VERSION='1.3.0' cat >>confdefs.h <<_ACEOF @@ -10819,19 +10819,19 @@ if test x$wguile = xfalse; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.0 >= 2.0" >&5 -$as_echo_n "checking for guile-2.0 >= 2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.2 >= 2.2" >&5 +$as_echo_n "checking for guile-2.2 >= 2.2... " >&6; } if test -n "$GUILE_CFLAGS"; then pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0 >= 2.0" 2>/dev/null` + pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.2 >= 2.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -10843,12 +10843,12 @@ pkg_cv_GUILE_LIBS="$GUILE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0 >= 2.0" 2>/dev/null` + pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.2 >= 2.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -10869,9 +10869,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1` + GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.2 >= 2.2" 2>&1` else - GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1` + GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.2 >= 2.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUILE_PKG_ERRORS" >&5 @@ -10891,19 +10891,19 @@ if test x$wguile = xfalse; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.2 >= 2.0" >&5 -$as_echo_n "checking for guile-2.2 >= 2.0... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for guile-2.0 >= 2.0" >&5 +$as_echo_n "checking for guile-2.0 >= 2.0... " >&6; } if test -n "$GUILE_CFLAGS"; then pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.2 >= 2.0" 2>/dev/null` + pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0 >= 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -10915,12 +10915,12 @@ pkg_cv_GUILE_LIBS="$GUILE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.2 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "guile-2.2 >= 2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= 2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "guile-2.0 >= 2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.2 >= 2.0" 2>/dev/null` + pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0 >= 2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -10941,9 +10941,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.2 >= 2.0" 2>&1` + GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1` else - GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.2 >= 2.0" 2>&1` + GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0 >= 2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUILE_PKG_ERRORS" >&5 @@ -10997,19 +10997,19 @@ if test x$gui = xtrue; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.14 pango >= 1.4" >&5 +$as_echo_n "checking for gtk+-3.0 >= 3.14 pango >= 1.4... " >&6; } if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.14 pango >= 1.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.14 pango >= 1.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.14 pango >= 1.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -11021,12 +11021,12 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.14 pango >= 1.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.14 pango >= 1.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.14 pango >= 1.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -11047,9 +11047,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.14 pango >= 1.4" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.14 pango >= 1.4" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -11675,7 +11675,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU MDK $as_me 1.2.11, which was +This file was extended by GNU MDK $as_me 1.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11743,7 +11743,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU MDK config.status 1.2.11 +GNU MDK config.status 1.3.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru mdk-1.2.11+dfsg/configure.ac mdk-1.3.0+dfsg/configure.ac --- mdk-1.2.11+dfsg/configure.ac 2020-10-15 19:58:38.000000000 +0000 +++ mdk-1.3.0+dfsg/configure.ac 2020-10-19 03:06:00.000000000 +0000 @@ -9,7 +9,7 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -AC_INIT([GNU MDK],1.2.11,[bug-mdk@gnu.org],mdk) +AC_INIT([GNU MDK],1.3.0,[bug-mdk@gnu.org],mdk) AC_CONFIG_SRCDIR([mixlib/mix.h]) AM_INIT_AUTOMAKE @@ -124,7 +124,7 @@ dnl Check for gtk+ if test x$gui = xtrue; then -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0 pango >= 1.4, +PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.14 pango >= 1.4, [LIBS="$LIBS $GTK_LIBS" AM_CFLAGS="$AM_CFLAGS $GTK_CFLAGS"], [AC_MSG_WARN(Cannot find GTK+/Glade/Pango: the GUI shall not be built) gui=false]) diff -Nru mdk-1.2.11+dfsg/debian/changelog mdk-1.3.0+dfsg/debian/changelog --- mdk-1.2.11+dfsg/debian/changelog 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/changelog 2021-12-30 17:14:42.000000000 +0000 @@ -1,3 +1,23 @@ +mdk (1.3.0+dfsg-3) unstable; urgency=medium + + * Declare compliance with Debian Policy 4.6.0 with no changes. + * Add the year 2021 to my debian/* copyright notice. + * Explicitly declare dh-sequence-single-binary as a virtual build + dependency. + * Update the Python autopkgtest a bit: + - reformat it using the black tool + - drop an unneeded hashbang line in a module file + - fix a minor Pylint suggestion + - add Tox test environment definitions + * New upstream release: + - drop the glib-deprecated patch, applied upstream + - update the typos patch + - refresh the line numbers in the cppcheck patch + - build with GTK+ 3: replace the libgtk2.0-dev and libglade2-dev + build dependencies with libgtk-3-dev; Closes: #967628, #967879 + + -- Peter Pentchev Thu, 30 Dec 2021 19:14:42 +0200 + mdk (1.2.11+dfsg-2) unstable; urgency=medium * Update the upstream copyright years for mdk-1.2.11. diff -Nru mdk-1.2.11+dfsg/debian/control mdk-1.3.0+dfsg/debian/control --- mdk-1.2.11+dfsg/debian/control 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/control 2021-12-30 17:14:42.000000000 +0000 @@ -4,14 +4,14 @@ Maintainer: Peter Pentchev Build-Depends: debhelper-compat (= 13), + dh-sequence-single-binary, flex, guile-3.0-dev, intltool, - libglade2-dev, - libgtk2.0-dev, + libgtk-3-dev, python3-pytest , zlib1g-dev -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Homepage: https://www.gnu.org/software/mdk/mdk.html Vcs-Browser: https://salsa.debian.org/debian/mdk Vcs-Git: https://salsa.debian.org/debian/mdk.git diff -Nru mdk-1.2.11+dfsg/debian/copyright mdk-1.3.0+dfsg/debian/copyright --- mdk-1.2.11+dfsg/debian/copyright 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/copyright 2021-12-30 17:14:42.000000000 +0000 @@ -27,7 +27,7 @@ Copyright: (C) 2001, 2002 Adrian Bunk (C) 2002-2007 Baruch Even - (C) 2011, 2014-2020 Peter Pentchev + (C) 2011, 2014-2021 Peter Pentchev License: GPL-2+ License: GPL-2+ diff -Nru mdk-1.2.11+dfsg/debian/patches/cppcheck.patch mdk-1.3.0+dfsg/debian/patches/cppcheck.patch --- mdk-1.2.11+dfsg/debian/patches/cppcheck.patch 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/patches/cppcheck.patch 2021-12-30 17:14:42.000000000 +0000 @@ -5,7 +5,7 @@ --- a/mixgtk/mixgtk_mixal.c +++ b/mixgtk/mixgtk_mixal.c -@@ -267,7 +267,7 @@ +@@ -255,7 +255,7 @@ gchar *new_tip; gchar **tokens; gchar *text = g_strdup (line); diff -Nru mdk-1.2.11+dfsg/debian/patches/glib-deprecated.patch mdk-1.3.0+dfsg/debian/patches/glib-deprecated.patch --- mdk-1.2.11+dfsg/debian/patches/glib-deprecated.patch 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/patches/glib-deprecated.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -Description: Do not use GLib's deprecated G_INLINE_FUNC. -Forwarded: not-yet -Author: Peter Pentchev -Last-Update: 2020-05-07 - ---- a/mixlib/xmix_vm.c -+++ b/mixlib/xmix_vm.c -@@ -24,14 +24,14 @@ - #include "xmix_vm.h" - - /* auxiliar functions */ --G_INLINE_FUNC mix_address_t -+static inline mix_address_t - get_M_ (const mix_vm_t *vm, const mix_ins_t *ins); --G_INLINE_FUNC mix_word_t -+static inline mix_word_t - get_V_ (const mix_vm_t *vm, const mix_ins_t *ins); --G_INLINE_FUNC mix_device_t * -+static inline mix_device_t * - get_dev_ (mix_vm_t *vm, mix_fspec_t type); - --G_INLINE_FUNC mix_address_t -+static inline mix_address_t - get_M_ (const mix_vm_t *vm, const mix_ins_t *ins) - { - if ( ins->index == 0 ) -@@ -41,13 +41,13 @@ - mix_word_to_short_fast (get_rI_ (vm, ins->index))); - } - --G_INLINE_FUNC mix_word_t -+static inline mix_word_t - get_V_ (const mix_vm_t *vm, const mix_ins_t *ins) - { - return mix_word_get_field (ins->fspec, get_cell_ (vm, get_M_ (vm,ins))); - } - --G_INLINE_FUNC mix_device_t * -+static inline mix_device_t * - get_dev_ (mix_vm_t *vm, mix_fspec_t type) - { - if (type >= BD_NO_) return NULL; diff -Nru mdk-1.2.11+dfsg/debian/patches/series mdk-1.3.0+dfsg/debian/patches/series --- mdk-1.2.11+dfsg/debian/patches/series 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/patches/series 2021-12-30 17:14:42.000000000 +0000 @@ -7,4 +7,3 @@ open-fmode.patch typos.patch large-file.patch -glib-deprecated.patch diff -Nru mdk-1.2.11+dfsg/debian/patches/typos.patch mdk-1.3.0+dfsg/debian/patches/typos.patch --- mdk-1.2.11+dfsg/debian/patches/typos.patch 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/patches/typos.patch 2021-12-30 17:14:42.000000000 +0000 @@ -3,7 +3,7 @@ this seems to be imported libintl source code. Forwarded: not-yet Author: Peter Pentchev -Last-Update: 2019-01-14 +Last-Update: 2021-12-30 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -84,7 +84,7 @@ - User Option: -disable-gui --- a/NEWS +++ b/NEWS -@@ -142,7 +142,7 @@ +@@ -148,7 +148,7 @@ - cbpo help string corrected (thanks to Michael Vernov). - I1 and I2 in mixvm swapped to their correct position (closes #15746). - Obsolete CFLAGS for Darwin removed. @@ -106,143 +106,26 @@ * Ryan Schmidt, Agustin Navarro (), Ying-Chieh Liao --- a/misc/mixal-mode.el +++ b/misc/mixal-mode.el -@@ -162,7 +162,7 @@ - ; (makunbound 'mixal-operation-codes-alist) - - (defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time) -- "Add an operation code to the list that contains information about possible op code's." -+ "Add an operation code to the list that contains information about possible opcodes." - (setq mixal-operation-codes-alist (cons (list op-code group full-name C-byte F-byte - description execution-time) - mixal-operation-codes-alist ))) -@@ -188,7 +188,7 @@ - "Put in rI1 the contents of cell no. M. - Uses a + when there is no sign in subfield. Subfield is left padded with - zeros to make a word. Index registers only have 2 bytes and a sign, Trying --to set anything more that that will result in undefined behavior." -+to set anything more than that will result in undefined behavior." - 2) - - (mixal-add-operation-code -@@ -196,7 +196,7 @@ - "Put in rI2 the contents of cell no. M. - Uses a + when there is no sign in subfield. Subfield is left padded with - zeros to make a word. Index registers only have 2 bytes and a sign, Trying --to set anything more that that will result in undefined behavior." -+to set anything more than that will result in undefined behavior." - 2) - - (mixal-add-operation-code -@@ -204,7 +204,7 @@ - "Put in rI3 the contents of cell no. M. - Uses a + when there is no sign in subfield. Subfield is left padded with - zeros to make a word. Index registers only have 2 bytes and a sign, Trying --to set anything more that that will result in undefined behavior." -+to set anything more than that will result in undefined behavior." - 2) - - (mixal-add-operation-code -@@ -212,7 +212,7 @@ - "Put in rI4 the contents of cell no. M. - Uses a + when there is no sign in subfield. Subfield is left padded with - zeros to make a word. Index registers only have 2 bytes and a sign, Trying --to set anything more that that will result in undefined behavior." -+to set anything more than that will result in undefined behavior." - 2) - - (mixal-add-operation-code -@@ -220,7 +220,7 @@ - "Put in rI5 the contents of cell no. M. - Uses a + when there is no sign in subfield. Subfield is left padded with - zeros to make a word. Index registers only have 2 bytes and a sign, Trying --to set anything more that that will result in undefined behavior." -+to set anything more than that will result in undefined behavior." - 2) - - (mixal-add-operation-code -@@ -228,7 +228,7 @@ - "Put in rI6 the contents of cell no. M. - Uses a + when there is no sign in subfield. Subfield is left padded with - zeros to make a word. Index registers only have 2 bytes and a sign, Trying --to set anything more that that will result in undefined behavior." -+to set anything more than that will result in undefined behavior." - 2) - - (mixal-add-operation-code -@@ -250,7 +250,7 @@ - "Put in rI1 the contents of cell no. M, with opposite sign. - Uses a + when there is no sign in subfield, otherwise use the opposite sign. - Subfield is left padded with zeros to make a word. Index registers only --have 2 bytes and a sign, Trying to set anything more that that will result -+have 2 bytes and a sign, Trying to set anything more than that will result - in undefined behavior." - 2) - -@@ -259,7 +259,7 @@ - "Put in rI2 the contents of cell no. M, with opposite sign. - Uses a + when there is no sign in subfield, otherwise use the opposite sign. - Subfield is left padded with zeros to make a word. Index registers only --have 2 bytes and a sign, Trying to set anything more that that will result -+have 2 bytes and a sign, Trying to set anything more than that will result - in undefined behavior." - 2) - -@@ -268,7 +268,7 @@ - "Put in rI3 the contents of cell no. M, with opposite sign. - Uses a + when there is no sign in subfield, otherwise use the opposite sign. - Subfield is left padded with zeros to make a word. Index registers only --have 2 bytes and a sign, Trying to set anything more that that will result -+have 2 bytes and a sign, Trying to set anything more than that will result - in undefined behavior." - 2) - -@@ -277,7 +277,7 @@ - "Put in rI4 the contents of cell no. M, with opposite sign. - Uses a + when there is no sign in subfield, otherwise use the opposite sign. - Subfield is left padded with zeros to make a word. Index registers only --have 2 bytes and a sign, Trying to set anything more that that will result -+have 2 bytes and a sign, Trying to set anything more than that will result - in undefined behavior." - 2) - -@@ -286,7 +286,7 @@ - "Put in rI5 the contents of cell no. M, with opposite sign. - Uses a + when there is no sign in subfield, otherwise use the opposite sign. - Subfield is left padded with zeros to make a word. Index registers only --have 2 bytes and a sign, Trying to set anything more that that will result -+have 2 bytes and a sign, Trying to set anything more than that will result - in undefined behavior." - 2) - -@@ -295,7 +295,7 @@ - "Put in rI6 the contents of cell no. M, with opposite sign. - Uses a + when there is no sign in subfield, otherwise use the opposite sign. - Subfield is left padded with zeros to make a word. Index registers only --have 2 bytes and a sign, Trying to set anything more that that will result -+have 2 bytes and a sign, Trying to set anything more than that will result - in undefined behavior." - 2) - -@@ -304,7 +304,7 @@ - "Store in cell Nr. M the contents of rA. +@@ -253,7 +253,7 @@ + "Store in cell Nr. M the contents of rA. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The +bytes are taken starting with the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield." - 2) + 2) -@@ -313,7 +313,7 @@ - "Store in cell Nr. M the contents of rX. +@@ -261,7 +261,7 @@ + "Store in cell Nr. M the contents of rX. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The +bytes are taken starting with the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield." - 2) + 2) -@@ -322,7 +322,7 @@ - "Store in cell Nr. M the contents of rI1. +@@ -269,7 +269,7 @@ + "Store in cell Nr. M the contents of rI1. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The @@ -250,8 +133,8 @@ sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." -@@ -333,7 +333,7 @@ - "Store in cell Nr. M the contents of rI2. +@@ -279,7 +279,7 @@ + "Store in cell Nr. M the contents of rI2. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The @@ -259,8 +142,8 @@ sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." -@@ -344,7 +344,7 @@ - "Store in cell Nr. M the contents of rI3. +@@ -289,7 +289,7 @@ + "Store in cell Nr. M the contents of rI3. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The @@ -268,8 +151,8 @@ sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." -@@ -355,7 +355,7 @@ - "Store in cell Nr. M the contents of rI4. +@@ -299,7 +299,7 @@ + "Store in cell Nr. M the contents of rI4. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The @@ -277,8 +160,8 @@ sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." -@@ -366,7 +366,7 @@ - "Store in cell Nr. M the contents of rI5. +@@ -309,7 +309,7 @@ + "Store in cell Nr. M the contents of rI5. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The @@ -286,8 +169,8 @@ sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." -@@ -377,7 +377,7 @@ - "Store in cell Nr. M the contents of rI6. +@@ -319,7 +319,7 @@ + "Store in cell Nr. M the contents of rI6. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The @@ -295,211 +178,173 @@ sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." -@@ -388,7 +388,7 @@ - "Store in cell Nr. M the contents of rJ. +@@ -329,7 +329,7 @@ + "Store in cell Nr. M the contents of rJ. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These -bytes are taken beginning by the rightmost side of the register. The sign +bytes are taken starting with the rightmost side of the register. The sign of rJ is always +, sign of the memory cell is not changed, unless it is part of the subfield. The default field for STJ is (0:2)." - 2) -@@ -404,7 +404,7 @@ - 'ADD 'arithmetic "add" 1 'field - "Add to A the contents of cell Nr. M. + 2) +@@ -343,7 +343,7 @@ + (ADD arithmetic "add" 1 field + "Add to A the contents of cell Nr. M. Subfield is padded with zero to make a word. -If the result is to large, the operation result modulo 1,073,741,823 (the +If the result is too large, the operation result modulo 1,073,741,823 (the maximum value storable in a MIX word) is stored in `rA', and the overflow toggle is set to TRUE." - 2) -@@ -413,7 +413,7 @@ - 'SUB 'arithmetic "subtract" 2 'field - "Subtract to A the contents of cell Nr. M. + 2) +@@ -351,7 +351,7 @@ + (SUB arithmetic "subtract" 2 field + "Subtract to A the contents of cell Nr. M. Subfield is padded with zero to make a word. -If the result is to large, the operation result modulo 1,073,741,823 (the +If the result is too large, the operation result modulo 1,073,741,823 (the maximum value storable in a MIX word) is stored in `rA', and the overflow toggle is set to TRUE." - 2) -@@ -427,8 +427,8 @@ - (mixal-add-operation-code - 'DIV 'arithmetic "divide" 4 'field - "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX. + 2) +@@ -363,8 +363,8 @@ + + (DIV arithmetic "divide" 4 field + "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX. -The sign is taken from rA, and after the divide the sign of rA is set to + when --both the sign of rA and M where the same. Divide by zero and overflow of rA result +-both the sign of rA and M where the same. Divide by zero and overflow of rA +The sign is taken from rA, and after the division the sign of rA is set to + when -+both the signs of rA and M where the same. Divide by zero and overflow of rA result - in undefined behavior." - 12) - -@@ -656,7 +656,7 @@ - 'CMP1 'comparison "compare I1" (+ 56 1) 'field - "Compare contents of rI1 with contents of M. ++both the signs of rA and M where the same. Divide by zero and overflow of rA + result in undefined behavior." + 12) + +@@ -555,42 +555,42 @@ + (CMP1 comparison "compare I1" 57 field + "Compare contents of rI1 with contents of M. The field specifier works on both fields. The comparison indicator -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 -+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3 ++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3 have a value of 0." - 2) + 2) -@@ -665,7 +665,7 @@ - 'CMP2 'comparison "compare I2" (+ 56 2) 'field - "Compare contents of rI2 with contents of M. + (CMP2 comparison "compare I2" 58 field + "Compare contents of rI2 with contents of M. The field specifier works on both fields. The comparison indicator -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 -+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3 ++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3 have a value of 0." - 2) + 2) -@@ -674,7 +674,7 @@ - 'CMP3 'comparison "compare I3" (+ 56 3) 'field - "Compare contents of rI3 with contents of M. + (CMP3 comparison "compare I3" 59 field + "Compare contents of rI3 with contents of M. The field specifier works on both fields. The comparison indicator -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 -+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3 ++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3 have a value of 0." - 2) + 2) -@@ -683,7 +683,7 @@ - 'CMP4 'comparison "compare I4" (+ 56 4) 'field - "Compare contents of rI4 with contents of M. + (CMP4 comparison "compare I4" 60 field + "Compare contents of rI4 with contents of M. The field specifier works on both fields. The comparison indicator -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 -+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3 ++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3 have a value of 0." - 2) + 2) -@@ -692,7 +692,7 @@ - 'CMP5 'comparison "compare I5" (+ 56 5) 'field - "Compare contents of rI5 with contents of M. + (CMP5 comparison "compare I5" 61 field + "Compare contents of rI5 with contents of M. The field specifier works on both fields. The comparison indicator -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 -+is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3 ++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1,2 and 3 have a value of 0." - 2) + 2) -@@ -701,7 +701,7 @@ - 'CMP6 'comparison "compare I6" (+ 56 6) 'field - "Compare contents of rI6 with contents of M. + (CMP6 comparison "compare I6" 62 field + "Compare contents of rI6 with contents of M. The field specifier works on both fields. The comparison indicator -is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 +is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3 have a value of 0." - 2) + 2) -@@ -1188,21 +1188,21 @@ +@@ -965,41 +965,41 @@ + 1) - (mixal-add-operation-code - 'SLA 'miscellaneous "shift left A" 6 0 -- "Shift to A, M bytes left. + (SLA miscellaneous "shift left A" 6 +- "Shift to A, M bytes left. -Hero's will be added to the right." -+ "Shift A, M bytes to the left. ++ "Shift A, M bytes to the left. +Zeros will be added to the right." - 2) - + 2) - (mixal-add-operation-code - 'SRA 'miscellaneous "shift right A" 6 1 -- "Shift to A, M bytes right. -+ "Shift A, M bytes to the right. + (SRA miscellaneous "shift right A" 6 +- "Shift to A, M bytes right. ++ "Shift A, M bytes to the right. Zeros will be added to the left." - 2) + 2) - - (mixal-add-operation-code - 'SLAX 'miscellaneous "shift left AX" 6 2 -- "Shift AX, M bytes left. -+ "Shift AX, M bytes to the left. + (SLAX miscellaneous "shift left AX" 6 +- "Shift AX, M bytes left. ++ "Shift AX, M bytes to the left. Zeros will be added to the right." - 2) - -@@ -1210,32 +1210,32 @@ + 2) - (mixal-add-operation-code - 'SRAX 'miscellaneous "shift right AX" 6 3 -- "Shift AX, M bytes right. -+ "Shift AX, M bytes to the right. + (SRAX miscellaneous "shift right AX" 6 +- "Shift AX, M bytes right. ++ "Shift AX, M bytes to the right. Zeros will be added to the left." - 2) - + 2) - (mixal-add-operation-code - 'SLC 'miscellaneous "shift left AX circularly" 6 4 -- "Shift AX, M bytes left circularly. + (SLC miscellaneous "shift left AX circularly" 6 +- "Shift AX, M bytes left circularly. -The bytes that fall off to the left will be added to the right." -+ "Shift AX, M bytes to the left circularly. -+The bits that fall off on the left will be added to the right." - 2) ++ "Shift AX, M bytes to the left circularly. ++The bytes that fall off on the left will be added to the right." + 2) - - (mixal-add-operation-code - 'SRC 'miscellaneous "shift right AX circularly" 6 4 -- "Shift AX, M bytes right circularly. + (SRC miscellaneous "shift right AX circularly" 6 +- "Shift AX, M bytes right circularly. -The bytes that fall off to the right will be added to the left." -+ "Shift AX, M bytes to the right circularly. ++ "Shift AX, M bytes to the right circularly. +The bytes that fall off on the right will be added to the left." - 2) + 2) + + (SLB miscellaneous "shift left AX binary" 6 +- "Shift AX, M binary places left." ++ "Shift AX, M binary places to the left." + 2) + + (SRB miscellaneous "shift right AX binary" 6 +- "Shift AX, M binary places right." ++ "Shift AX, M binary places to the right." + 2) + + (MOVE miscellaneous "move" 7 number +@@ -1039,14 +1039,14 @@ + 1) - (mixal-add-operation-code - 'SLB 'miscellaneous "shift left AX binary" 6 6 -- "Shift AX, M binary places left." -+ "Shift AX, M binary places to the left." - 2) - - (mixal-add-operation-code - 'SRB 'miscellaneous "shift right AX binary" 6 7 -- "Shift AX, M binary places right." -+ "Shift AX, M binary places to the right." - 2) - - (mixal-add-operation-code -@@ -1285,15 +1285,15 @@ - - (mixal-add-operation-code - 'NUM 'conversion "convert to numeric" 5 0 -- "Convert rAX to its numerical value and store it in rA. + (NUM conversion "convert to numeric" 5 +- "Convert rAX to its numerical value and store it in rA. -the register rAX is assumed to contain a character representation of -+ "Convert rAX to its numerical value and store it into rA. ++ "Convert rAX to its numerical value and store it into rA. +The register rAX is assumed to contain a character representation of a number." - 10) + 10) - (mixal-add-operation-code - 'CHAR 'conversion "convert to characters" 5 1 - "Convert the number stored in rA to a character representation. + (CHAR conversion "convert to characters" 5 + "Convert the number stored in rA to a character representation. -The converted character representation is stored in rAX." +The converted character representation is stored into rAX." - 10) + 10)) - (defvar mixal-describe-operation-code-history nil -@@ -1302,15 +1302,15 @@ - (defun mixal-describe-operation-code (&optional op-code) - "Display the full documentation of OP-CODE." - (interactive) -- ;; we like to provide completition and history, so do it ourself (interactive "?bla")? -+ ;; we like to provide completion and history, so do it ourself (interactive "?bla")? - (unless op-code - (let* ((completion-ignore-case t) - ;; we already have a list, but it is not in the right format -- ;; transform it to a valid table so completition can use it -+ ;; transform it to a valid table so completion can use it - (table (mapcar '(lambda (elm) - (cons (symbol-name (car elm)) nil)) + "Alist that contains all the possible operation codes for mix. +@@ -1097,7 +1097,7 @@ + ;; transform it to a valid table so completion can use it + (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil)) mixal-operation-codes-alist)) - ;; prompt is different depending on we are close to a valid op-code + ;; prompt is different depending on whether we are close to a valid op-code - (have-default (member (current-word) mixal-operation-codes)) + (have-default (assq (intern-soft (current-word)) + mixal-operation-codes-alist)) (prompt (concat "Describe operation code " - (if have-default -@@ -1334,7 +1334,7 @@ - - ;;;; Running - (defun mixal-run () -- "Run's mixal file in current buffer, assumes that file has been compiled" -+ "Runs mixal file in current buffer, assumes that file has been compiled" - (interactive) - (mixvm (concat "mixvm -r -t -d " - (file-name-sans-extension (buffer-file-name))))) --- a/mixguile/mixguile.c +++ b/mixguile/mixguile.c @@ -101,7 +101,7 @@ @@ -612,21 +457,12 @@ #, c-format --- a/mixgtk/mixgtk.glade +++ b/mixgtk/mixgtk.glade -@@ -454,7 +454,7 @@ - - - True -- Toogle save settings on exit -+ Toggle save settings on exit - Save on _exit - True - -@@ -1444,7 +1444,7 @@ +@@ -763,7 +763,7 @@ + 0 True - 0.47999998927116394 - 0.52999997138977051 + False - MIX asssembler path + MIX assembler path True - - + 0.47999998927116394 + 0.52999997138977051 diff -Nru mdk-1.2.11+dfsg/debian/tests/python/test_primes.py mdk-1.3.0+dfsg/debian/tests/python/test_primes.py --- mdk-1.2.11+dfsg/debian/tests/python/test_primes.py 2020-10-25 12:22:42.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/tests/python/test_primes.py 2021-12-30 17:14:42.000000000 +0000 @@ -1,4 +1,3 @@ -#!/usr/bin/python3 """ Compile and run the primes.mixal sample program using mixvm and mixguile. """ @@ -24,7 +23,7 @@ def prepare_home_dir(home_dir: pathlib.Path) -> None: - """ Create any necessary files in the temporary home directory. """ + """Create any necessary files in the temporary home directory.""" home_dir.mkdir(mode=0o755) if MIXLOCAL: @@ -33,12 +32,13 @@ mdk_dir.mkdir(mode=0o755) for path in sorted(guile_dir.glob("*.scm")): subprocess.check_call( - ["cp", "--", path, mdk_dir], shell=False, + ["cp", "--", path, mdk_dir], + shell=False, ) def examine_output(fname: pathlib.Path) -> None: - """ Examine the primes output file. """ + """Examine the primes output file.""" print(f"Examining {fname}") with fname.open(mode="r", encoding=ENC) as printer_file: line = printer_file.readline() @@ -53,9 +53,9 @@ print(f'Looking for {" ".join(sorted(found.keys()))}') for line in printer_file.readlines(): words = set(line.split()) - for num in found: + for num, value in found.items(): if num in words: - assert not found[num] + assert not value found[num] = True print(f"Result: {found}") @@ -73,7 +73,7 @@ commands: str, mix_env: Dict[str, str], ) -> None: - """ Create a subdir and input and output files, run a program. """ + """Create a subdir and input and output files, run a program.""" program_dir.mkdir(mode=0o755) infile = program_dir / "in.txt" infile.write_text(commands, encoding=ENC) @@ -103,7 +103,7 @@ def test_primes() -> None: - """ Primes sample program test: compile, run, check. """ + """Primes sample program test: compile, run, check.""" print("") if not SRCFILE.is_file(): sys.exit(f'Not a file: "{SRCFILE}"; set TEST_SRCDIR?') diff -Nru mdk-1.2.11+dfsg/debian/tests/setup.cfg mdk-1.3.0+dfsg/debian/tests/setup.cfg --- mdk-1.2.11+dfsg/debian/tests/setup.cfg 1970-01-01 00:00:00.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/tests/setup.cfg 2021-12-30 17:14:42.000000000 +0000 @@ -0,0 +1,3 @@ +[mypy] +strict = True +python_version = 3.6 diff -Nru mdk-1.2.11+dfsg/debian/tests/tox.ini mdk-1.3.0+dfsg/debian/tests/tox.ini --- mdk-1.2.11+dfsg/debian/tests/tox.ini 1970-01-01 00:00:00.000000000 +0000 +++ mdk-1.3.0+dfsg/debian/tests/tox.ini 2021-12-30 17:14:42.000000000 +0000 @@ -0,0 +1,62 @@ +[tox] +envlist = + black + pep8 + pep8h + mypy + pylint + functional +skipsdist = True + +[defs] +pyfiles = + python + +[testenv:black] +deps = + black >= 21b0, < 22b0 +commands = + black --check {[defs]pyfiles} + +[testenv:black-reformat] +deps = + black >= 21b0, < 22b0 +commands = + black {[defs]pyfiles} + +[testenv:pep8] +deps = + flake8 +commands = + flake8 {[defs]pyfiles} + +[testenv:pep8h] +deps = + flake8 + hacking >= 4 +commands = + flake8 {[defs]pyfiles} + +[testenv:mypy] +deps = + mypy +commands = + mypy {[defs]pyfiles} + +[testenv:pylint] +deps = + pylint +commands = + pylint {[defs]pyfiles} + +[testenv:functional] +deps = + pytest +setenv = + TEST_SRCDIR = {env:TEST_SRCDIR:{toxinidir}/../..} + TEST_MIXASM_PROG = {env:TEST_MIXASM_PROG:{toxinidir}/../../mixutils/mixasm} + TEST_MIXVM_PROG = {env:TEST_MIXVM_PROG:{toxinidir}/../../mixutils/mixvm} + TEST_MIXGUILE_PROG = {env:TEST_MIXGUILE_PROG:{toxinidir}/../../mixguile/mixguile} + TEST_MIX_USE_LOCAL = 1 +commands = + pytest {posargs} python diff -Nru mdk-1.2.11+dfsg/misc/mixal-mode.el mdk-1.3.0+dfsg/misc/mixal-mode.el --- mdk-1.2.11+dfsg/misc/mixal-mode.el 2015-11-16 22:32:29.000000000 +0000 +++ mdk-1.3.0+dfsg/misc/mixal-mode.el 2020-10-18 16:47:23.000000000 +0000 @@ -1,43 +1,45 @@ -;;; 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, 2004, 2005, 2007 Free Software Foundation - -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation; either version 3 of -;; the License, or (at your option) any later version. - -;; This program is distributed in the hope that it will be -;; useful, but WITHOUT ANY WARRANTY; without even the implied -;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. See the GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public -;; License along with this program; if not, write to the Free -;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -;; MA 02110-1301 USA +;; Copyright (C) 2003-2020 Free Software Foundation, Inc. ;; Author: Pieter E.J. Pareit -;; Maintainer: Pieter E.J. Pareit +;; Maintainer: Jose A Ortega Ruiz ;; Created: 09 Nov 2002 -;; Version: 0.1 -;; Keywords: Knuth mix mixal asm mixvm "The Art Of Computer Programming" +;; Version: 0.4 +;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer Programming + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . ;;; Commentary: + ;; Major mode for the mix asm language. ;; The mix asm language is described in "The Art Of Computer Programming". ;; -;; For optimal use, also use GNU MDK. Compiling needs mixasm, running -;; and debugging needs mixvm and mixvm.el from GNU MDK. You can get +;; For optimal use, also use GNU MDK. Compiling needs mixasm, running +;; and debugging needs mixvm and mixvm.el from GNU MDK. You can get ;; GNU MDK from `https://savannah.gnu.org/projects/mdk/' and -;; `ftp://ftp.gnu.org/pub/gnu/mdk'. +;; `https://ftp.gnu.org/pub/gnu/mdk'. ;; -;; To use this mode, place the following in your .emacs file: +;; To use this mode, place the following in your init file: ;; `(load-file "/PATH-TO-FILE/mixal-mode.el")'. +;; ;; When you load a file with the extension .mixal the mode will be started -;; automatic. If you want to start the mode manual, use `M-x mixal-mode'. -;; Font locking will work, the behavior of tabs is the same as emacs -;; default behavior. You can compile a source file with `C-c c' you can +;; automatically. If you want to start the mode manually, use `M-x mixal-mode'. +;; Font locking will work, the behavior of tabs is the same as Emacs's +;; default behavior. You can compile a source file with `C-c c' you can ;; run a compiled file with `C-c r' or run it in debug mode with `C-c d'. ;; You can get more information about a particular operation code by using ;; mixal-describe-operation-code or `C-h o'. @@ -45,7 +47,18 @@ ;; 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. +;; Use [^ \t\n]+ to match the operand part of a line. +;; Drop mixal-operation-codes. +;; Build the mixal-operation-codes-alist immediately. +;; Use `interactive' in mixal-describe-operation-code. +;; Remove useless ".*$" at the end of some regexps. +;; Fix the definition of comment-start-skip. ;; 08/10/05: sync mdk and emacs cvs ;; from emacs: compile-command and require-final-newline ;; from mdk: see version 0.2 @@ -68,21 +81,23 @@ ;;; Key map (defvar mixal-mode-map (let ((map (make-sparse-keymap))) - (define-key map "\C-cc" 'compile) - (define-key map "\C-cr" 'mixal-run) - (define-key map "\C-cd" 'mixal-debug) - (define-key map "\C-ho" 'mixal-describe-operation-code) + (define-key map "\C-c\C-c" 'compile) + (define-key map "\C-c\C-r" 'mixal-run) + (define-key map "\C-c\C-d" 'mixal-debug) + (define-key map "\C-h\C-o" 'mixal-describe-operation-code) map) "Keymap for `mixal-mode'.") -; (makunbound 'mixal-mode-map) +;; (makunbound 'mixal-mode-map) ;;; Syntax table (defvar mixal-mode-syntax-table (let ((st (make-syntax-table))) - ; (modify-syntax-entry ?* "<" st) we need to do a bit more to make - ; (modify-syntax-entry ?\n ">" st) fontlocking for comments work + ;; We need to do a bit more to make fontlocking for comments work. + ;; See use of syntax-propertize-function. + ;; (modify-syntax-entry ?* "<" st) + (modify-syntax-entry ?\n ">" st) st) - "Syntax table for `dot-mode'.") + "Syntax table for `mixal-mode'.") (defvar mixal-font-lock-label-face 'font-lock-variable-name-face "Face name to use for label names. @@ -99,49 +114,9 @@ Default value is that of `font-lock-builtin-face', but you can modify its value.") -(defvar mixal-operation-codes - '("NOP" "ADD" "FADD" "SUB" "FSUB" "MUL" "FMUL" "DIV" "FDIV" "NUM" "CHAR" - "HLT" "SLA" "SRA" "SLAX" "SRAX" "SLC" "SRC" "SLB" "SRB" "MOVE" "LDA" "LD1" "LD2" "LD3" - "LD4" "LD5" "LD6" "LDX" "LDAN" "LD1N" "LD2N" "LD3N" "LD4N" "LD5N" "LD6N" - "LDXN" "STA" "ST1" "ST2" "ST3" "ST4" "ST5" "ST6" "STX" "STJ" "STZ" "JBUS" - "IOC" "IN" "OUT" "JRAD" "JMP" "JSJ" "JOV" "JNOV" - "JL" "JE" "JG" "JGE" "JNE" "JLE" - "JAN" "J1N" "J2N" "J3N" "J4N" "J5N" "J6N" "JXN" - "JAZ" "J1Z" "J2Z" "J3Z" "J4Z" "J5Z" "J6Z" "JXZ" - "JAP" "J1P" "J2P" "J3P" "J4P" "J5P" "J6P" "JXP" - "JANN" "J1NN" "J2NN" "J3NN" "J4NN" "J5NN" "J6NN" "JXNN" - "JANZ" "J1NZ" "J2NZ" "J3NZ" "J4NZ" "J5NZ" "J6NZ" "JXNZ" - "JANP" "J1NP" "J2NP" "J3NP" "J4NP" "J5NP" "J6NP" "JXNP" - "JAE" "JXE" - "JAO" "JXO" - "INCA" "DECA" "ENTA" "ENNA" "INC1" "DEC1" "ENT1" "ENN1" - "INC2" "DEC2" "ENT2" "ENN2" "INC3" "DEC3" "ENT3" "ENN3" "INC4" "DEC4" - "ENT4" "ENN4" "INC5" "DEC5" "ENT5" "ENN5" "INC6" "DEC6" "ENT6" "ENN6" - "INCX" "DECX" "ENTX" "ENNX" "CMPA" "FCMP" "CMP1" "CMP2" "CMP3" "CMP4" - "CMP5" "CMP6" "CMPX") - "List of possible operation codes as strings.") -; (makunbound 'mixal-operation-codes) - (defvar mixal-assembly-pseudoinstructions '("ORIG" "EQU" "CON" "ALF" "END") - "List of possible assembly pseudoinstructions") - -;;; Font-locking: -(defvar mixal-font-lock-keywords - `(("^\\([A-Z0-9a-z]+\\).*$" - (1 mixal-font-lock-label-face)) - (,(regexp-opt mixal-operation-codes 'words) - . mixal-font-lock-operation-code-face) - (,(regexp-opt - mixal-assembly-pseudoinstructions 'words) - . mixal-font-lock-assembly-pseudoinstruction-face) - ("^[A-Z0-9a-z]*[ \t]+[A-ZO-9a-z]+[ \t]+\\(=.*=\\).*$" - (1 font-lock-constant-face)) - ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+[A-Z0-9a-z,():+-\\*=\" ]*[\t]+\\(.*\\)$" - (1 font-lock-comment-face)) - ("^\\*.*$" . font-lock-comment-face)) - "Keyword highlighting specification for `mixal-mode'.") -; (makunbound 'mixal-font-lock-keywords) + "List of possible assembly pseudoinstructions.") ;;;; Compilation ;; Output from mixasm is compatible with default behavior of emacs, @@ -151,1175 +126,988 @@ ;; Tabs works well by default. ;;;; Describe -(defvar mixal-operation-codes-alist '() - "Alist that contains all the possible operation codes for mix. -Each elt has the form (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME) -Where OP-CODE is the text of the opcode as an symbol, FULL-NAME is the human readable name -as a string, C-BYTE is the operation code telling what operation is to be performed, F-BYTE holds -an modification of the operation code which can be a symbol or a number, DESCRIPTION contains -an string with a description about the operation code and EXECUTION-TIME holds info -about the time it takes, number or string.") -; (makunbound 'mixal-operation-codes-alist) - -(defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time) - "Add an operation code to the list that contains information about possible op code's." - (setq mixal-operation-codes-alist (cons (list op-code group full-name C-byte F-byte - description execution-time) - mixal-operation-codes-alist ))) - -;; now add each operation code - -(mixal-add-operation-code - 'LDA 'loading "load A" 8 'field - "Put in rA the contents of cell no. M. +(defvar mixal-operation-codes-alist + ;; FIXME: the codes FADD, FSUB, FMUL, FDIV, JRAD, and FCMP were in + ;; mixal-operation-codes but not here. They should probably be added here. + ;; + ;; We used to define this with a backquote and subexps like ,(+ 8 3) for + ;; better clarity, but the resulting code was too big and caused the + ;; byte-compiler to eat up all the stack space. Even using + ;; `eval-when-compile' didn't help because the byte-compiler insists on + ;; compiling the code before evaluating it. + '((LDA loading "load A" 8 field + "Put in rA the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with zeros to make a word." - 2) + 2) -(mixal-add-operation-code - 'LDX 'loading "load X" 15 'field - "Put in rX the contents of cell no. M. + (LDX loading "load X" 15 field + "Put in rX the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with zeros to make a word." - 2) + 2) -(mixal-add-operation-code - 'LD1 'loading "load I1" (+ 8 1) 'field - "Put in rI1 the contents of cell no. M. + (LD1 loading "load I1" 9 field + "Put in rI1 the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with -zeros to make a word. Index registers only have 2 bytes and a sign, Trying -to set anything more that that will result in undefined behavior." - 2) - -(mixal-add-operation-code - 'LD2 'loading "load I2" (+ 8 2) 'field - "Put in rI2 the contents of cell no. M. +zeros to make a word. Index registers only have 2 bytes and a sign; trying +to set anything more than that will result in undefined behavior." + 2) + + (LD2 loading "load I2" 10 field + "Put in rI2 the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with -zeros to make a word. Index registers only have 2 bytes and a sign, Trying -to set anything more that that will result in undefined behavior." - 2) - -(mixal-add-operation-code - 'LD3 'loading "load I3" (+ 8 3) 'field - "Put in rI3 the contents of cell no. M. +zeros to make a word. Index registers only have 2 bytes and a sign; trying +to set anything more than that will result in undefined behavior." + 2) + + (LD3 loading "load I3" 11 field + "Put in rI3 the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with -zeros to make a word. Index registers only have 2 bytes and a sign, Trying -to set anything more that that will result in undefined behavior." - 2) - -(mixal-add-operation-code - 'LD4 'loading "load I4" (+ 8 4) 'field - "Put in rI4 the contents of cell no. M. +zeros to make a word. Index registers only have 2 bytes and a sign; trying +to set anything more than that will result in undefined behavior." + 2) + + (LD4 loading "load I4" 12 field + "Put in rI4 the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with -zeros to make a word. Index registers only have 2 bytes and a sign, Trying -to set anything more that that will result in undefined behavior." - 2) - -(mixal-add-operation-code - 'LD5 'loading "load I5" (+ 8 5) 'field - "Put in rI5 the contents of cell no. M. +zeros to make a word. Index registers only have 2 bytes and a sign; trying +to set anything more than that will result in undefined behavior." + 2) + + (LD5 loading "load I5" 13 field + "Put in rI5 the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with -zeros to make a word. Index registers only have 2 bytes and a sign, Trying -to set anything more that that will result in undefined behavior." - 2) - -(mixal-add-operation-code - 'LD6 'loading "load I6" (+ 8 6) 'field - "Put in rI6 the contents of cell no. M. +zeros to make a word. Index registers only have 2 bytes and a sign; trying +to set anything more than that will result in undefined behavior." + 2) + + (LD6 loading "load I6" 14 field + "Put in rI6 the contents of cell no. M. Uses a + when there is no sign in subfield. Subfield is left padded with -zeros to make a word. Index registers only have 2 bytes and a sign, Trying -to set anything more that that will result in undefined behavior." - 2) - -(mixal-add-operation-code - 'LDAN 'loading "load A negative" 16 'field - "Put in rA the contents of cell no. M, with opposite sign. +zeros to make a word. Index registers only have 2 bytes and a sign; trying +to set anything more than that will result in undefined behavior." + 2) + + (LDAN loading "load A negative" 16 field + "Put in rA the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word." - 2) + 2) -(mixal-add-operation-code - 'LDXN 'loading "load X negative" 23 'field - "Put in rX the contents of cell no. M, with opposite sign. + (LDXN loading "load X negative" 23 field + "Put in rX the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word." - 2) + 2) -(mixal-add-operation-code - 'LD1N 'loading "load I1 negative" (+ 16 1) 'field - "Put in rI1 the contents of cell no. M, with opposite sign. + (LD1N loading "load I1 negative" 17 field + "Put in rI1 the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word. Index registers only -have 2 bytes and a sign, Trying to set anything more that that will result +have 2 bytes and a sign; trying to set anything more than that will result in undefined behavior." - 2) + 2) -(mixal-add-operation-code - 'LD2N 'loading "load I2 negative" (+ 16 2) 'field - "Put in rI2 the contents of cell no. M, with opposite sign. + (LD2N loading "load I2 negative" 18 field + "Put in rI2 the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word. Index registers only -have 2 bytes and a sign, Trying to set anything more that that will result +have 2 bytes and a sign; trying to set anything more than that will result in undefined behavior." - 2) + 2) -(mixal-add-operation-code - 'LD3N 'loading "load I3 negative" (+ 16 3) 'field - "Put in rI3 the contents of cell no. M, with opposite sign. + (LD3N loading "load I3 negative" 19 field + "Put in rI3 the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word. Index registers only -have 2 bytes and a sign, Trying to set anything more that that will result +have 2 bytes and a sign; trying to set anything more than that will result in undefined behavior." - 2) + 2) -(mixal-add-operation-code - 'LD4N 'loading "load I4 negative" (+ 16 4) 'field - "Put in rI4 the contents of cell no. M, with opposite sign. + (LD4N loading "load I4 negative" 20 field + "Put in rI4 the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word. Index registers only -have 2 bytes and a sign, Trying to set anything more that that will result +have 2 bytes and a sign; trying to set anything more than that will result in undefined behavior." - 2) + 2) -(mixal-add-operation-code - 'LD5N 'loading "load I5 negative" (+ 16 5) 'field - "Put in rI5 the contents of cell no. M, with opposite sign. + (LD5N loading "load I5 negative" 21 field + "Put in rI5 the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word. Index registers only -have 2 bytes and a sign, Trying to set anything more that that will result +have 2 bytes and a sign; trying to set anything more than that will result in undefined behavior." - 2) + 2) -(mixal-add-operation-code - 'LD6N 'loading "load I6 negative" (+ 16 6) 'field - "Put in rI6 the contents of cell no. M, with opposite sign. + (LD6N loading "load I6 negative" 22 field + "Put in rI6 the contents of cell no. M, with opposite sign. Uses a + when there is no sign in subfield, otherwise use the opposite sign. Subfield is left padded with zeros to make a word. Index registers only -have 2 bytes and a sign, Trying to set anything more that that will result +have 2 bytes and a sign; trying to set anything more than that will result in undefined behavior." - 2) + 2) -(mixal-add-operation-code - 'STA 'storing "store A" 24 'field - "Store in cell Nr. M the contents of rA. + (STA storing "store A" 24 field + "Store in cell Nr. M the contents of rA. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield." - 2) + 2) -(mixal-add-operation-code - 'STX 'storing "store X" 31 'field - "Store in cell Nr. M the contents of rX. + (STX storing "store X" 31 field + "Store in cell Nr. M the contents of rX. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield." - 2) + 2) -(mixal-add-operation-code - 'ST1 'storing "store I1" (+ 24 1) 'field - "Store in cell Nr. M the contents of rI1. + (ST1 storing "store I1" 25 field + "Store in cell Nr. M the contents of rI1. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." - 2) + 2) -(mixal-add-operation-code - 'ST2 'storing "store I2" (+ 24 2) 'field - "Store in cell Nr. M the contents of rI2. + (ST2 storing "store I2" 26 field + "Store in cell Nr. M the contents of rI2. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." - 2) + 2) -(mixal-add-operation-code - 'ST3 'storing "store I3" (+ 24 3) 'field - "Store in cell Nr. M the contents of rI3. + (ST3 storing "store I3" 27 field + "Store in cell Nr. M the contents of rI3. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." - 2) + 2) -(mixal-add-operation-code - 'ST4 'storing "store I4" (+ 24 4) 'field - "Store in cell Nr. M the contents of rI4. + (ST4 storing "store I4" 28 field + "Store in cell Nr. M the contents of rI4. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." - 2) + 2) -(mixal-add-operation-code - 'ST5 'storing "store I5" (+ 24 5) 'field - "Store in cell Nr. M the contents of rI5. + (ST5 storing "store I5" 29 field + "Store in cell Nr. M the contents of rI5. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." - 2) + 2) -(mixal-add-operation-code - 'ST6 'storing "store I6" (+ 24 6) 'field - "Store in cell Nr. M the contents of rI6. + (ST6 storing "store I6" 30 field + "Store in cell Nr. M the contents of rI6. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of the memory cell is not changed, unless it is part of the subfield. Because index registers only have 2 bytes and a sign, the rest of the bytes are assumed to be 0." - 2) + 2) -(mixal-add-operation-code - 'STJ 'storing "store J" 32 'field - "Store in cell Nr. M the contents of rJ. + (STJ storing "store J" 32 field + "Store in cell Nr. M the contents of rJ. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with bytes from a register. These bytes are taken beginning by the rightmost side of the register. The sign of rJ is always +, sign of the memory cell is not changed, unless it is part of the subfield. The default field for STJ is (0:2)." - 2) + 2) -(mixal-add-operation-code - 'STZ 'storing "store zero" 33 'field - "Store in cell Nr. M '+ 0'. + (STZ storing "store zero" 33 field + "Store in cell Nr. M `+ 0'. The modification of the operation code represents the subfield of the memory cell that is to be overwritten with zeros." - 2) + 2) -(mixal-add-operation-code - 'ADD 'arithmetic "add" 1 'field - "Add to A the contents of cell Nr. M. + (ADD arithmetic "add" 1 field + "Add to A the contents of cell Nr. M. Subfield is padded with zero to make a word. If the result is to large, the operation result modulo 1,073,741,823 (the maximum value storable in a MIX word) is stored in `rA', and the overflow toggle is set to TRUE." - 2) + 2) -(mixal-add-operation-code - 'SUB 'arithmetic "subtract" 2 'field - "Subtract to A the contents of cell Nr. M. + (SUB arithmetic "subtract" 2 field + "Subtract to A the contents of cell Nr. M. Subfield is padded with zero to make a word. If the result is to large, the operation result modulo 1,073,741,823 (the maximum value storable in a MIX word) is stored in `rA', and the overflow toggle is set to TRUE." - 2) + 2) -(mixal-add-operation-code - 'MUL 'arithmetic "multiply" 3 'field - "Multiplies the contents of cell Nr. M with A, result is 10 bytes and stored in rA and rX. + (MUL arithmetic "multiply" 3 field + "Multiplies the contents of cell Nr. M with A, result is 10 bytes and stored in rA and rX. The sign is + if the sign of rA and cell M where the same, otherwise, it is -" - 10) + 10) -(mixal-add-operation-code - 'DIV 'arithmetic "divide" 4 'field - "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX. + (DIV arithmetic "divide" 4 field + "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX. The sign is taken from rA, and after the divide the sign of rA is set to + when -both the sign of rA and M where the same. Divide by zero and overflow of rA result -in undefined behavior." - 12) +both the sign of rA and M where the same. Divide by zero and overflow of rA +result in undefined behavior." + 12) -(mixal-add-operation-code - 'ENTA 'address-transfer "enter A" 48 2 - "Literal value is stored in rA. + (ENTA address-transfer "enter A" 48 + "Literal value is stored in rA. Indexed, stores value of index in rA." - 1) + 1) -(mixal-add-operation-code - 'ENTX 'address-transfer "enter X" 55 2 - "Literal value is stored in rX. + (ENTX address-transfer "enter X" 55 + "Literal value is stored in rX. Indexed, stores value of index in rX." - 1) + 1) -(mixal-add-operation-code - 'ENT1 'address-transfer "Enter rI1" (+ 48 1) 2 - "Literal value is stored in rI1. + (ENT1 address-transfer "Enter rI1" 49 + "Literal value is stored in rI1. Indexed, stores value of index in rI1." - 1) + 1) -(mixal-add-operation-code - 'ENT2 'address-transfer "Enter rI2" (+ 48 2) 2 - "Literal value is stored in rI2. + (ENT2 address-transfer "Enter rI2" 50 + "Literal value is stored in rI2. Indexed, stores value of index in rI2." - 1) + 1) -(mixal-add-operation-code - 'ENT3 'address-transfer "Enter rI3" (+ 48 3) 2 - "Literal value is stored in rI3. + (ENT3 address-transfer "Enter rI3" 51 + "Literal value is stored in rI3. Indexed, stores value of index in rI3." - 1) + 1) -(mixal-add-operation-code - 'ENT4 'address-transfer "Enter rI4" (+ 48 4) 2 - "Literal value is stored in rI4. + (ENT4 address-transfer "Enter rI4" 52 + "Literal value is stored in rI4. Indexed, stores value of index in rI4." - 1) + 1) -(mixal-add-operation-code - 'ENT5 'address-transfer "Enter rI5" (+ 48 5) 2 - "Literal value is stored in rI5. + (ENT5 address-transfer "Enter rI5" 53 + "Literal value is stored in rI5. Indexed, stores value of index in rI5." - 1) + 1) -(mixal-add-operation-code - 'ENT6 'address-transfer "Enter rI6" (+ 48 6) 2 - "Literal value is stored in rI6. + (ENT6 address-transfer "Enter rI6" 54 + "Literal value is stored in rI6. Indexed, stores value of index in rI6." - 1) + 1) -(mixal-add-operation-code - 'ENNA 'address-transfer "enter negative A" 48 3 - "Literal value is stored in rA with opposite sign. + (ENNA address-transfer "enter negative A" 48 + "Literal value is stored in rA with opposite sign. Indexed, stores value of index in rA with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'ENNX 'address-transfer "enter negative X" 55 3 - "Literal value is stored in rX with opposite sign. + (ENNX address-transfer "enter negative X" 55 + "Literal value is stored in rX with opposite sign. Indexed, stores value of index in rX with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'ENN1 'address-transfer "Enter negative rI1" (+ 48 1) 3 - "Literal value is stored in rI1 with opposite sign. + (ENN1 address-transfer "Enter negative rI1" 49 + "Literal value is stored in rI1 with opposite sign. Indexed, stores value of index in rI1 with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'ENN2 'address-transfer "Enter negative rI2" (+ 48 2) 3 - "Literal value is stored in rI2 with opposite sign. + (ENN2 address-transfer "Enter negative rI2" 50 + "Literal value is stored in rI2 with opposite sign. Indexed, stores value of index in rI2 with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'ENN3 'address-transfer "Enter negative rI3" (+ 48 3) 3 - "Literal value is stored in rI3 with opposite sign. + (ENN3 address-transfer "Enter negative rI3" 51 + "Literal value is stored in rI3 with opposite sign. Indexed, stores value of index in rI3 with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'ENN4 'address-transfer "Enter negative rI4" (+ 48 4) 3 - "Literal value is stored in rI4 with opposite sign. + (ENN4 address-transfer "Enter negative rI4" 52 + "Literal value is stored in rI4 with opposite sign. Indexed, stores value of index in rI4 with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'ENN5 'address-transfer "Enter negative rI5" (+ 48 5) 3 - "Literal value is stored in rI5 with opposite sign. + (ENN5 address-transfer "Enter negative rI5" 53 + "Literal value is stored in rI5 with opposite sign. Indexed, stores value of index in rI5 with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'ENN6 'address-transfer "Enter negative rI6" (+ 48 6) 3 - "Literal value is stored in rI6 with opposite sign. + (ENN6 address-transfer "Enter negative rI6" 54 + "Literal value is stored in rI6 with opposite sign. Indexed, stores value of index in rI6 with opposite sign." - 1) + 1) -(mixal-add-operation-code - 'INCA 'address-transfer "increase A" 48 0 - "Increase register A with the literal value of M. + (INCA address-transfer "increase A" 48 + "Increase register A with the literal value of M. On overflow the overflow toggle is set." - 1) + 1) -(mixal-add-operation-code - 'INCX 'address-transfer "increase X" 55 0 - "Increase register X with the literal value of M. + (INCX address-transfer "increase X" 55 + "Increase register X with the literal value of M. On overflow the overflow toggle is set." - 1) + 1) -(mixal-add-operation-code - 'INC1 'address-transfer "increase I1" (+ 48 1) 0 - "Increase register I1 with the literal value of M. + (INC1 address-transfer "increase I1" 49 + "Increase register I1 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'INC2 'address-transfer "increase I2" (+ 48 2) 0 - "Increase register I2 with the literal value of M. + (INC2 address-transfer "increase I2" 50 + "Increase register I2 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'INC3 'address-transfer "increase I3" (+ 48 3) 0 - "Increase register I3 with the literal value of M. + (INC3 address-transfer "increase I3" 51 + "Increase register I3 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'INC4 'address-transfer "increase I4" (+ 48 4) 0 - "Increase register I4 with the literal value of M. + (INC4 address-transfer "increase I4" 52 + "Increase register I4 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'INC5 'address-transfer "increase I5" (+ 48 5) 0 - "Increase register I5 with the literal value of M. + (INC5 address-transfer "increase I5" 53 + "Increase register I5 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'INC6 'address-transfer "increase I6" (+ 48 6) 0 - "Increase register I6 with the literal value of M. + (INC6 address-transfer "increase I6" 54 + "Increase register I6 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'DECA 'address-transfer "decrease A" 48 1 - "Decrease register A with the literal value of M. + (DECA address-transfer "decrease A" 48 + "Decrease register A with the literal value of M. On overflow the overflow toggle is set." - 1) + 1) -(mixal-add-operation-code - 'DECX 'address-transfer "decrease X" 55 1 - "Decrease register X with the literal value of M. + (DECX address-transfer "decrease X" 55 + "Decrease register X with the literal value of M. On overflow the overflow toggle is set." - 1) + 1) -(mixal-add-operation-code - 'DEC1 'address-transfer "decrease I1" (+ 48 1) 1 - "Decrease register I1 with the literal value of M. + (DEC1 address-transfer "decrease I1" 49 + "Decrease register I1 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'DEC2 'address-transfer "decrease I2" (+ 48 2) 1 - "Decrease register I2 with the literal value of M. + (DEC2 address-transfer "decrease I2" 50 + "Decrease register I2 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'DEC3 'address-transfer "decrease I3" (+ 48 3) 1 - "Decrease register I3 with the literal value of M. + (DEC3 address-transfer "decrease I3" 51 + "Decrease register I3 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'DEC4 'address-transfer "decrease I4" (+ 48 4) 1 - "Decrease register I4 with the literal value of M. + (DEC4 address-transfer "decrease I4" 52 + "Decrease register I4 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'DEC5 'address-transfer "decrease I5" (+ 48 5) 1 - "Decrease register I5 with the literal value of M. + (DEC5 address-transfer "decrease I5" 53 + "Decrease register I5 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'DEC6 'address-transfer "decrease I6" (+ 48 6) 1 - "Decrease register I6 with the literal value of M. + (DEC6 address-transfer "decrease I6" 54 + "Decrease register I6 with the literal value of M. The result is undefined when the result does not fit in 2 bytes." - 1) + 1) -(mixal-add-operation-code - 'CMPA 'comparison "compare A" 56 'field - "Compare contents of A with contents of M. + (CMPA comparison "compare A" 56 field + "Compare contents of A with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome." - 2) - + 2) -(mixal-add-operation-code - 'CMPX 'comparison "compare X" 63 'field - "Compare contents of rX with contents of M. + (CMPX comparison "compare X" 63 field + "Compare contents of rX with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome." - 2) + 2) - -(mixal-add-operation-code - 'CMP1 'comparison "compare I1" (+ 56 1) 'field - "Compare contents of rI1 with contents of M. + (CMP1 comparison "compare I1" 57 field + "Compare contents of rI1 with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 have a value of 0." - 2) - + 2) -(mixal-add-operation-code - 'CMP2 'comparison "compare I2" (+ 56 2) 'field - "Compare contents of rI2 with contents of M. + (CMP2 comparison "compare I2" 58 field + "Compare contents of rI2 with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 have a value of 0." - 2) - + 2) -(mixal-add-operation-code - 'CMP3 'comparison "compare I3" (+ 56 3) 'field - "Compare contents of rI3 with contents of M. + (CMP3 comparison "compare I3" 59 field + "Compare contents of rI3 with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 have a value of 0." - 2) + 2) - -(mixal-add-operation-code - 'CMP4 'comparison "compare I4" (+ 56 4) 'field - "Compare contents of rI4 with contents of M. + (CMP4 comparison "compare I4" 60 field + "Compare contents of rI4 with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 have a value of 0." - 2) - + 2) -(mixal-add-operation-code - 'CMP5 'comparison "compare I5" (+ 56 5) 'field - "Compare contents of rI5 with contents of M. + (CMP5 comparison "compare I5" 61 field + "Compare contents of rI5 with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 have a value of 0." - 2) + 2) - -(mixal-add-operation-code - 'CMP6 'comparison "compare I6" (+ 56 6) 'field - "Compare contents of rI6 with contents of M. + (CMP6 comparison "compare I6" 62 field + "Compare contents of rI6 with contents of M. The field specifier works on both fields. The comparison indicator is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3 have a value of 0." - 2) + 2) -(mixal-add-operation-code - 'JMP 'jump "jump" 39 0 - "Unconditional jump. + (JMP jump "jump" 39 + "Unconditional jump. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'JSJ 'jump "jump, save J" 39 1 - "Unconditional jump, but rJ is not modified." - 1) + (JSJ jump "jump, save J" 39 + "Unconditional jump, but rJ is not modified." + 1) -(mixal-add-operation-code - 'JOV 'jump "jump on overflow" 39 2 - "Jump if OV is set (and turn it off). + (JOV jump "jump on overflow" 39 + "Jump if OV is set (and turn it off). Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'JNOV 'jump "Jump on no overflow" 39 3 - "Jump if OV is not set (and turn it off). + (JNOV jump "Jump on no overflow" 39 + "Jump if OV is not set (and turn it off). Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'JL 'jump "Jump on less" 39 4 - "Jump if '[CM] = L'. + (JL jump "Jump on less" 39 + "Jump if '[CM] = L'. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JE 'jump "Jump on equal" 39 5 - "Jump if '[CM] = E'. + (JE jump "Jump on equal" 39 + "Jump if '[CM] = E'. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'JG 'jump "Jump on greater" 39 6 - "Jump if '[CM] = G'. + (JG jump "Jump on greater" 39 + "Jump if '[CM] = G'. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JGE 'jump "Jump on not less" 39 7 - "Jump if '[CM]' does not equal 'L'. + (JGE jump "Jump on not less" 39 + "Jump if '[CM]' does not equal 'L'. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JNE 'jump "Jump on not equal" 39 8 - "Jump if '[CM]' does not equal 'E'. + (JNE jump "Jump on not equal" 39 + "Jump if '[CM]' does not equal 'E'. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'JLE 'jump "Jump on not greater" 39 9 - "Jump if '[CM]' does not equal 'G'. + (JLE jump "Jump on not greater" 39 + "Jump if '[CM]' does not equal 'G'. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'JAN 'jump "jump A negative" 40 0 - "Jump if the content of rA is negative. + (JAN jump "jump A negative" 40 + "Jump if the content of rA is negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JAZ 'jump "jump A zero" 40 1 - "Jump if the content of rA is zero. + (JAZ jump "jump A zero" 40 + "Jump if the content of rA is zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JAP 'jump "jump A positive" 40 2 - "Jump if the content of rA is positive. + (JAP jump "jump A positive" 40 + "Jump if the content of rA is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'JANN 'jump "jump A non-negative" 40 3 - "Jump if the content of rA is non-negative. + (JANN jump "jump A non-negative" 40 + "Jump if the content of rA is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JANZ 'jump "jump A non-zero" 40 4 - "Jump if the content of rA is non-zero. + (JANZ jump "jump A non-zero" 40 + "Jump if the content of rA is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JANP 'jump "jump A non-positive" 40 5 - "Jump if the content of rA is non-positive. + (JANP jump "jump A non-positive" 40 + "Jump if the content of rA is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'JAE 'jump "jump A even" 40 6 - "Jump if the content of rA is even. + (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) + 1) -(mixal-add-operation-code - 'JAO 'jump "jump A odd" 40 7 - "Jump if the content of rA is odd. + (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) + 1) -(mixal-add-operation-code - 'JXN 'jump "jump X negative" 47 0 - "Jump if the content of rX is negative. + (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 been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'JXZ 'jump "jump X zero" 47 1 - "Jump if the content of rX is zero. + (JXZ jump "jump X zero" 47 + "Jump if the content of rX is zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JXP 'jump "jump X positive" 47 2 - "Jump if the content of rX is positive. + (JXP jump "jump X positive" 47 + "Jump if the content of rX is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JXNN 'jump "jump X non-negative" 47 3 - "Jump if the content of rX is non-negative. + (JXNN jump "jump X non-negative" 47 + "Jump if the content of rX is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'JXNZ 'jump "jump X non-zero" 47 4 - "Jump if the content of rX is non-zero. + (JXNZ jump "jump X non-zero" 47 + "Jump if the content of rX is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'JXNP 'jump "jump X non-positive" 47 5 - "Jump if the content of rX is non-positive. + (JXNP jump "jump X non-positive" 47 + "Jump if the content of rX is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'JXE 'jump "jump X even" 47 6 - "Jump if the content of rX is even. + (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) + 1) -(mixal-add-operation-code - 'JXO 'jump "jump X odd" 47 7 - "Jump if the content of rX is odd. + (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) + 1) -(mixal-add-operation-code - 'J1N 'jump "jump I1 negative" (+ 40 1) 0 - "Jump if the content of rI1 is negative. + (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) - + 1) -(mixal-add-operation-code - 'J1Z 'jump "jump I1 zero" (+ 40 1) 1 - "Jump if the content of rI1 is zero. + (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 been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J1P 'jump "jump I1 positive" (+ 40 1) 2 - "Jump if the content of rI1 is positive. + (J1P jump "jump I1 positive" 41 + "Jump if the content of rI1 is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J1NN 'jump "jump I1 non-negative" (+ 40 1) 3 - "Jump if the content of rI1 is non-negative. + (J1NN jump "jump I1 non-negative" 41 + "Jump if the content of rI1 is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J1NZ 'jump "jump I1 non-zero" (+ 40 1) 4 - "Jump if the content of rI1 is non-zero. + (J1NZ jump "jump I1 non-zero" 41 + "Jump if the content of rI1 is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J1NP 'jump "jump I1 non-positive" (+ 40 1) 5 - "Jump if the content of rI1 is non-positive. + (J1NP jump "jump I1 non-positive" 41 + "Jump if the content of rI1 is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'J2N 'jump "jump I2 negative" (+ 40 1) 0 - "Jump if the content of rI2 is negative. + (J2N jump "jump I2 negative" 41 + "Jump if the content of rI2 is negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J2Z 'jump "jump I2 zero" (+ 40 1) 1 - "Jump if the content of rI2 is zero. + (J2Z jump "jump I2 zero" 41 + "Jump if the content of rI2 is zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J2P 'jump "jump I2 positive" (+ 40 1) 2 - "Jump if the content of rI2 is positive. + (J2P jump "jump I2 positive" 41 + "Jump if the content of rI2 is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J2NN 'jump "jump I2 non-negative" (+ 40 1) 3 - "Jump if the content of rI2 is non-negative. + (J2NN jump "jump I2 non-negative" 41 + "Jump if the content of rI2 is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J2NZ 'jump "jump I2 non-zero" (+ 40 1) 4 - "Jump if the content of rI2 is non-zero. + (J2NZ jump "jump I2 non-zero" 41 + "Jump if the content of rI2 is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J2NP 'jump "jump I2 non-positive" (+ 40 1) 5 - "Jump if the content of rI2 is non-positive. + (J2NP jump "jump I2 non-positive" 41 + "Jump if the content of rI2 is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J3N 'jump "jump I3 negative" (+ 40 1) 0 - "Jump if the content of rI3 is negative. + (J3N jump "jump I3 negative" 41 + "Jump if the content of rI3 is negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J3Z 'jump "jump I3 zero" (+ 40 1) 1 - "Jump if the content of rI3 is zero. + (J3Z jump "jump I3 zero" 41 + "Jump if the content of rI3 is zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J3P 'jump "jump I3 positive" (+ 40 1) 2 - "Jump if the content of rI3 is positive. + (J3P jump "jump I3 positive" 41 + "Jump if the content of rI3 is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J3NN 'jump "jump I3 non-negative" (+ 40 1) 3 - "Jump if the content of rI3 is non-negative. + (J3NN jump "jump I3 non-negative" 41 + "Jump if the content of rI3 is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J3NZ 'jump "jump I3 non-zero" (+ 40 1) 4 - "Jump if the content of rI3 is non-zero. + (J3NZ jump "jump I3 non-zero" 41 + "Jump if the content of rI3 is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J3NP 'jump "jump I3 non-positive" (+ 40 1) 5 - "Jump if the content of rI3 is non-positive. + (J3NP jump "jump I3 non-positive" 41 + "Jump if the content of rI3 is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J4N 'jump "jump I4 negative" (+ 40 1) 0 - "Jump if the content of rI4 is negative. + (J4N jump "jump I4 negative" 41 + "Jump if the content of rI4 is negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J4Z 'jump "jump I4 zero" (+ 40 1) 1 - "Jump if the content of rI4 is zero. + (J4Z jump "jump I4 zero" 41 + "Jump if the content of rI4 is zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J4P 'jump "jump I4 positive" (+ 40 1) 2 - "Jump if the content of rI4 is positive. + (J4P jump "jump I4 positive" 41 + "Jump if the content of rI4 is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J4NN 'jump "jump I4 non-negative" (+ 40 1) 3 - "Jump if the content of rI4 is non-negative. + (J4NN jump "jump I4 non-negative" 41 + "Jump if the content of rI4 is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J4NZ 'jump "jump I4 non-zero" (+ 40 1) 4 - "Jump if the content of rI4 is non-zero. + (J4NZ jump "jump I4 non-zero" 41 + "Jump if the content of rI4 is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J4NP 'jump "jump I4 non-positive" (+ 40 1) 5 - "Jump if the content of rI4 is non-positive. + (J4NP jump "jump I4 non-positive" 41 + "Jump if the content of rI4 is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J5N 'jump "jump I5 negative" (+ 40 1) 0 - "Jump if the content of rI5 is negative. + (J5N jump "jump I5 negative" 41 + "Jump if the content of rI5 is negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J5Z 'jump "jump I5 zero" (+ 40 1) 1 - "Jump if the content of rI5 is zero. + (J5Z jump "jump I5 zero" 41 + "Jump if the content of rI5 is zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J5P 'jump "jump I5 positive" (+ 40 1) 2 - "Jump if the content of rI5 is positive. + (J5P jump "jump I5 positive" 41 + "Jump if the content of rI5 is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J5NN 'jump "jump I5 non-negative" (+ 40 1) 3 - "Jump if the content of rI5 is non-negative. + (J5NN jump "jump I5 non-negative" 41 + "Jump if the content of rI5 is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J5NZ 'jump "jump I5 non-zero" (+ 40 1) 4 - "Jump if the content of rI5 is non-zero. + (J5NZ jump "jump I5 non-zero" 41 + "Jump if the content of rI5 is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J5NP 'jump "jump I5 non-positive" (+ 40 1) 5 - "Jump if the content of rI5 is non-positive. + (J5NP jump "jump I5 non-positive" 41 + "Jump if the content of rI5 is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J6N 'jump "jump I6 negative" (+ 40 1) 0 - "Jump if the content of rI6 is negative. + (J6N jump "jump I6 negative" 41 + "Jump if the content of rI6 is negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J6Z 'jump "jump I6 zero" (+ 40 1) 1 - "Jump if the content of rI6 is zero. + (J6Z jump "jump I6 zero" 41 + "Jump if the content of rI6 is zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J6P 'jump "jump I6 positive" (+ 40 1) 2 - "Jump if the content of rI6 is positive. + (J6P jump "jump I6 positive" 41 + "Jump if the content of rI6 is positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J6NN 'jump "jump I6 non-negative" (+ 40 1) 3 - "Jump if the content of rI6 is non-negative. + (J6NN jump "jump I6 non-negative" 41 + "Jump if the content of rI6 is non-negative. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) - -(mixal-add-operation-code - 'J6NZ 'jump "jump I6 non-zero" (+ 40 1) 4 - "Jump if the content of rI6 is non-zero. + (J6NZ jump "jump I6 non-zero" 41 + "Jump if the content of rI6 is non-zero. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) - + 1) -(mixal-add-operation-code - 'J6NP 'jump "jump I6 non-positive" (+ 40 1) 5 - "Jump if the content of rI6 is non-positive. + (J6NP jump "jump I6 non-positive" 41 + "Jump if the content of rI6 is non-positive. Register J is set to the value of the next instruction that would have been executed when there was no jump." - 1) + 1) -(mixal-add-operation-code - 'SLA 'miscellaneous "shift left A" 6 0 - "Shift to A, M bytes left. + (SLA miscellaneous "shift left A" 6 + "Shift to A, M bytes left. Hero's will be added to the right." - 2) + 2) - -(mixal-add-operation-code - 'SRA 'miscellaneous "shift right A" 6 1 - "Shift to A, M bytes right. + (SRA miscellaneous "shift right A" 6 + "Shift to A, M bytes right. Zeros will be added to the left." - 2) - + 2) -(mixal-add-operation-code - 'SLAX 'miscellaneous "shift left AX" 6 2 - "Shift AX, M bytes left. + (SLAX miscellaneous "shift left AX" 6 + "Shift AX, M bytes left. Zeros will be added to the right." - 2) + 2) - - -(mixal-add-operation-code - 'SRAX 'miscellaneous "shift right AX" 6 3 - "Shift AX, M bytes right. + (SRAX miscellaneous "shift right AX" 6 + "Shift AX, M bytes right. Zeros will be added to the left." - 2) - + 2) -(mixal-add-operation-code - 'SLC 'miscellaneous "shift left AX circularly" 6 4 - "Shift AX, M bytes left circularly. + (SLC miscellaneous "shift left AX circularly" 6 + "Shift AX, M bytes left circularly. The bytes that fall off to the left will be added to the right." - 2) + 2) - -(mixal-add-operation-code - 'SRC 'miscellaneous "shift right AX circularly" 6 4 - "Shift AX, M bytes right circularly. + (SRC miscellaneous "shift right AX circularly" 6 + "Shift AX, M bytes right circularly. The bytes that fall off to the right will be added to the left." - 2) + 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))) + + (NOP miscellaneous "no operation" 0 ignored + "No operation, M and F are not used by the machine." + 1) -(mixal-add-operation-code - 'SLB 'miscellaneous "shift left AX binary" 6 6 - "Shift AX, M binary places left." - 2) - -(mixal-add-operation-code - 'SRB 'miscellaneous "shift right AX binary" 6 7 - "Shift AX, M binary places right." - 2) - -(mixal-add-operation-code - 'MOVE 'miscellaneous "move" 7 'number - "Move MOD words from M to the location stored in rI1." - '(+ 1 (* 2 number))) - -(mixal-add-operation-code - 'NOP 'miscellaneous "no operation" 0 'ignored - "No operation, M and F are not used by the machine." - 1) - -(mixal-add-operation-code - 'HLT 'miscellaneous "halt" 5 2 - "Halt. + (HLT miscellaneous "halt" 5 + "Halt. Stop instruction fetching." - 1) + 1) -(mixal-add-operation-code - 'IN 'input-output "input" 36 'unit - "Transfer a block of words from the specified unit to memory. + (IN input-output "input" 36 unit + "Transfer a block of words from the specified unit to memory. The transfer starts at address M." - 1) + 1) -(mixal-add-operation-code - 'OUT 'input-output "output" 37 'unit - "Transfer a block of words from memory. + (OUT input-output "output" 37 unit + "Transfer a block of words from memory. The transfer starts at address M to the specified unit." - 1) + 1) -(mixal-add-operation-code - 'IOC 'input-output "input-output control" 35 'unit - "Perform a control operation. + (IOC input-output "input-output control" 35 unit + "Perform a control operation. The control operation is given by M on the specified unit." - 1) + 1) + + (JRED input-output "jump ready" 38 unit + "Jump to M if the specified unit is ready." + 1) + + (JBUS input-output "jump busy" 34 unit + "Jump to M if the specified unit is busy." + 1) -(mixal-add-operation-code - 'JRED 'input-output "jump ready" 38 'unit - "Jump to M if the specified unit is ready." - 1) - - -(mixal-add-operation-code - 'JBUS 'input-output "jump busy" 34 'unit - "Jump to M if the specified unit is busy." - 1) - -(mixal-add-operation-code - 'NUM 'conversion "convert to numeric" 5 0 - "Convert rAX to its numerical value and store it in rA. + (NUM conversion "convert to numeric" 5 + "Convert rAX to its numerical value and store it in rA. the register rAX is assumed to contain a character representation of a number." - 10) + 10) -(mixal-add-operation-code - 'CHAR 'conversion "convert to characters" 5 1 - "Convert the number stored in rA to a character representation. + (CHAR conversion "convert to characters" 5 + "Convert the number stored in rA to a character representation. The converted character representation is stored in rAX." - 10) + 10)) + + "Alist that contains all the possible operation codes for mix. +Each elt has the form + (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME) +Where OP-CODE is the text of the opcode as a symbol, +FULL-NAME is the human readable name as a string, +C-BYTE is the operation code telling what operation is to be performed, +F-BYTE holds a modification of the operation code which can be a symbol + or a number, +DESCRIPTION contains an string with a description about the operation code and +EXECUTION-TIME holds info about the time it takes, number or string.") +;; (makunbound 'mixal-operation-codes-alist) + + +;;; Font-locking: +(defconst mixal-syntax-propertize-function + (syntax-propertize-rules + ;; Normal comments start with a * in column 0 and end at end of line. + ("^\\*" (0 "<")) + ;; Every line can end with a comment which is placed after the operand. + ;; I assume here that mnemonics without operands can not have a comment. + ("^[[:alnum:]]*[ \t]+[[:alnum:]]+[ \t]+[^ \n\t]+[ \t]*\\([ \t]\\)[^\n \t]" + (1 "<")))) + +(defvar mixal-font-lock-keywords + `(("^\\([A-Z0-9a-z]+\\)" + (1 mixal-font-lock-label-face)) + (,(regexp-opt (mapcar (lambda (x) (symbol-name (car x))) + mixal-operation-codes-alist) 'words) + . mixal-font-lock-operation-code-face) + (,(regexp-opt mixal-assembly-pseudoinstructions 'words) + . mixal-font-lock-assembly-pseudoinstruction-face) + ("^[A-Z0-9a-z]*[ \t]+[A-Z0-9a-z]+[ \t]+\\(=.*=\\)" + (1 font-lock-constant-face))) + "Keyword highlighting specification for `mixal-mode'.") +;; (makunbound 'mixal-font-lock-keywords) (defvar mixal-describe-operation-code-history nil "History list for describe operation code.") -(defun mixal-describe-operation-code (&optional op-code) +(defun mixal-describe-operation-code (op-code) "Display the full documentation of OP-CODE." - (interactive) - ;; we like to provide completition and history, so do it ourself (interactive "?bla")? - (unless op-code + (interactive + (list (let* ((completion-ignore-case t) ;; we already have a list, but it is not in the right format - ;; transform it to a valid table so completition can use it - (table (mapcar '(lambda (elm) - (cons (symbol-name (car elm)) nil)) + ;; transform it to a valid table so completion can use it + (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil)) mixal-operation-codes-alist)) ;; prompt is different depending on we are close to a valid op-code - (have-default (member (current-word) mixal-operation-codes)) + (have-default (assq (intern-soft (current-word)) + mixal-operation-codes-alist)) (prompt (concat "Describe operation code " (if have-default (concat "(default " (current-word) "): ") ": ")))) - ;; as the operation code to the user - (setq op-code (completing-read prompt table nil t nil - 'mixal-describe-operation-code-history - (current-word))))) + ;; As the operation code to the user. + (completing-read prompt table nil t nil + 'mixal-describe-operation-code-history + (current-word))))) ;; get the info on the op-code and output it to the help buffer (let ((op-code-help (assq (intern-soft op-code) mixal-operation-codes-alist))) (when op-code-help @@ -1334,35 +1122,38 @@ ;;;; Running (defun mixal-run () - "Run's mixal file in current buffer, assumes that file has been compiled" + "Run mixal file in current buffer, assumes that file has been compiled." (interactive) - (mixvm (concat "mixvm -r -t -d " - (file-name-sans-extension (buffer-file-name))))) + (if (fboundp 'mixvm) + (mixvm (concat "mixvm -r -t -d " + (file-name-sans-extension (buffer-file-name)))) + (error "mixvm.el needs to be loaded to run `mixvm'"))) (defun mixal-debug () - "Starts mixvm for debugging, assumes that file has been compiled with debugging support" + "Start mixvm for debugging. +Assumes that file has been compiled with debugging support." (interactive) - (mixvm (concat "mixvm " - (file-name-sans-extension (buffer-file-name))))) + (if (fboundp 'mixvm) + (mixvm (concat "mixvm " + (file-name-sans-extension (buffer-file-name)))) + (error "mixvm.el needs to be loaded to run `mixvm'"))) ;;;###autoload -(define-derived-mode mixal-mode fundamental-mode "mixal" - "Major mode for the mixal asm language. -\\{mixal-mode-map}" +(define-derived-mode mixal-mode prog-mode "mixal" + "Major mode for the mixal asm language." (set (make-local-variable 'comment-start) "*") - (set (make-local-variable 'comment-start-skip) "*") - (set (make-local-variable 'font-lock-defaults) '(mixal-font-lock-keywords)) -; might add an indent function in the future -; (set (make-local-variable 'indent-line-function) 'mixal-indent-line) - (set (make-local-variable 'compile-command) (concat "mixasm " - buffer-file-name)) - ;; mixasm will do strange when there is no final newline, - ;; so let Emacs ensure that it is always there - (set (make-local-variable 'require-final-newline) - mode-require-final-newline)) - -;;;###autoload -(add-to-list 'auto-mode-alist '("\\.mixal\\'" . mixal-mode)) + (set (make-local-variable 'comment-start-skip) "^\\*[ \t]*") + (set (make-local-variable 'font-lock-defaults) + '(mixal-font-lock-keywords)) + (set (make-local-variable 'syntax-propertize-function) + mixal-syntax-propertize-function) + ;; might add an indent function in the future + ;; (set (make-local-variable 'indent-line-function) 'mixal-indent-line) + (set (make-local-variable 'compile-command) + (concat "mixasm " + (if buffer-file-name + (shell-quote-argument buffer-file-name))))) (provide 'mixal-mode) + ;;; mixal-mode.el ends here diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_cmd_dispatcher.c mdk-1.3.0+dfsg/mixgtk/mixgtk_cmd_dispatcher.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_cmd_dispatcher.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_cmd_dispatcher.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_cmd_dispatcher.c : * Implementation of the functions declared in mixgtk_cmd_dispatcher.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -411,14 +411,14 @@ #ifdef HAVE_LIBHISTORY HIST_ENTRY *entry = NULL; - if (key == GDK_Up) + if (key == GDK_KEY_Up) { entry = previous_history (); if (entry && entry->line) gtk_entry_set_text (w, entry->line); result = TRUE; } - if (key == GDK_Down) + if (key == GDK_KEY_Down) { entry = next_history (); if (entry && entry->line) @@ -427,7 +427,7 @@ } #endif - if (key == GDK_Tab) + if (key == GDK_KEY_Tab) { complete_command_ (); result = TRUE; diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_device.c mdk-1.3.0+dfsg/mixgtk/mixgtk_device.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_device.c 2019-04-09 01:43:07.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_device.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- ---------------- mixgtk_device.c : * actual types for mixgtk devices * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -181,8 +181,8 @@ { input_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_INPUT_DIALOG); g_assert (input_dlg_); - input_dlg_entry_ = GTK_ENTRY (mixgtk_widget_factory_get_child_by_name - (MIXGTK_INPUT_DIALOG, "input_entry")); + input_dlg_entry_ = + GTK_ENTRY (mixgtk_widget_factory_get_by_name ("input_entry")); g_assert (input_dlg_entry_); GtkEntryCompletion *completion = gtk_entry_completion_new (); input_list_ = gtk_list_store_new (1, G_TYPE_STRING); @@ -195,6 +195,7 @@ gtk_entry_completion_set_minimum_key_length (completion, 1); gtk_entry_completion_set_text_column (completion, 0); gtk_entry_set_completion (input_dlg_entry_, completion); + gtk_widget_hide (input_dlg_); } static gboolean @@ -339,7 +340,7 @@ gtk_tree_view_new_with_model (GTK_TREE_MODEL (bindev->store)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dev->widget), FALSE); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE); + // gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (dev->widget), TRUE); for (k = 0; k < BIN_DEV_COL_; ++k) { @@ -480,11 +481,17 @@ } +static gpointer +combo_child_ () +{ + return gtk_bin_get_child (GTK_BIN (combo_)); +} + static mix_device_type_t get_device_idx_ (void) { int k; - const gchar *name = gtk_entry_get_text (GTK_ENTRY (GTK_BIN (combo_)->child)); + const gchar *name = gtk_entry_get_text (GTK_ENTRY (combo_child_ ())); for (k = 0; k <= LAST_BIN_DEV_; ++k) if (!strcmp (name, DEF_NAMES_[k])) break; return k; @@ -495,16 +502,13 @@ { devdlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVFORM_DIALOG); g_assert (devdlg_); - dtoggle_ = mixgtk_widget_factory_get_child_by_name - (MIXGTK_DEVFORM_DIALOG, "decradio"); + dtoggle_ = mixgtk_widget_factory_get_by_name ("decradio"); g_assert (dtoggle_); - wtoggle_ = mixgtk_widget_factory_get_child_by_name - (MIXGTK_DEVFORM_DIALOG, "wordradio"); + wtoggle_ = mixgtk_widget_factory_get_by_name ("wordradio"); g_assert (wtoggle_); - combo_ = mixgtk_widget_factory_get_child_by_name - (MIXGTK_DEVFORM_DIALOG, "dev_combo"); + combo_ = mixgtk_widget_factory_get_by_name ("dev_combo"); g_assert (combo_); - gtk_editable_set_editable (GTK_EDITABLE (GTK_BIN (combo_)->child), FALSE); + gtk_editable_set_editable (GTK_EDITABLE (combo_child_ ()), FALSE); } void @@ -572,9 +576,8 @@ { devdir_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVDIR_DIALOG); g_assert (devdir_dlg_); - devdir_entry_ = GTK_ENTRY - (mixgtk_widget_factory_get_child_by_name (MIXGTK_DEVDIR_DIALOG, - DEVDIR_ENTRY_NAME)); + devdir_entry_ = + GTK_ENTRY (mixgtk_widget_factory_get_by_name (DEVDIR_ENTRY_NAME)); g_assert (devdir_entry_); } gtk_entry_set_text (devdir_entry_, mix_device_get_dir ()); @@ -591,8 +594,8 @@ gtk_file_chooser_dialog_new (_("Devices folder"), GTK_WINDOW (devdir_dlg_), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); if (current != NULL) diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_external.c mdk-1.3.0+dfsg/mixgtk/mixgtk_external.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_external.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_external.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_cmd_dispatcher.c : * Implementation of the functions declared in mixgtk_external.h * ------------------------------------------------------------------ - * Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + * Copyright (C) 2006, 2007, 2008, 2009, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -95,8 +95,7 @@ for (k = 0; k < ext_wdg_no; ++k) { - ext_wdg_[k] = mixgtk_widget_factory_get_child_by_name - (MIXGTK_EXTERNPROG_DIALOG, ext_wdg_names_[k]); + ext_wdg_[k] = mixgtk_widget_factory_get_by_name (ext_wdg_names_[k]); g_assert (ext_wdg_[k]); } diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_fontsel.c mdk-1.3.0+dfsg/mixgtk/mixgtk_fontsel.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_fontsel.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_fontsel.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_fontsel.c : * Implementation of the functions declared in mixgtk_fontsel.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. + * Copyright (C) 2001, 2004, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,8 @@ #include "mixgtk_device.h" #include "mixgtk_fontsel.h" -static GtkFontSelectionDialog *fontsel_dialog_ = NULL; +static GtkFontChooserDialog *fontsel_dialog_ = NULL; +#define FONTSEL_ GTK_FONT_CHOOSER (fontsel_dialog_) static const gchar *keys_[MIX_FONT_NO] = { "MIX.font", "Prompt.font", "Log.font", "MIXAL.font", "Devices.font", @@ -42,7 +43,7 @@ init_fontsel_ (void) { fontsel_dialog_ = - GTK_FONT_SELECTION_DIALOG + GTK_FONT_CHOOSER_DIALOG (mixgtk_widget_factory_get_dialog (MIXGTK_FONTSEL_DIALOG)); g_assert (fontsel_dialog_ != NULL); } @@ -67,8 +68,7 @@ if (font_desc) { - gtk_widget_modify_font (w, font_desc); - gtk_widget_queue_draw (w); + gtk_widget_override_font (w, font_desc); pango_font_description_free (font_desc); } else @@ -87,8 +87,7 @@ if (!fontsel_dialog_) init_fontsel_ (); current = mixgtk_config_get (keys_[f]); - gtk_font_selection_dialog_set_font_name (fontsel_dialog_, - current? current : default_font_); + gtk_font_chooser_set_font (FONTSEL_, current? current : default_font_); while (result == GTK_RESPONSE_APPLY) { @@ -98,7 +97,7 @@ gint k; mixgtk_config_update (keys_[f], - gtk_font_selection_dialog_get_font_name (fontsel_dialog_)); + gtk_font_chooser_get_font (FONTSEL_)); for (k = 0; k < no; ++k) mixgtk_fontsel_set_font (f, w[k]); ret = TRUE; @@ -117,8 +116,7 @@ if (!fontsel_dialog_) init_fontsel_ (); current = mixgtk_config_get (keys_[MIX_FONT_DEFAULT]); - gtk_font_selection_dialog_set_font_name (fontsel_dialog_, - current? current : default_font_); + gtk_font_chooser_set_font (FONTSEL_, current? current : default_font_); while (result == GTK_RESPONSE_APPLY) { @@ -126,7 +124,7 @@ if (result != GTK_RESPONSE_CANCEL) { gint k; - current = gtk_font_selection_dialog_get_font_name (fontsel_dialog_); + current = gtk_font_chooser_get_font (FONTSEL_); for (k = 0; k < MIX_FONT_NO; ++k) mixgtk_config_update (keys_[k], current); diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_gen_handlers.c mdk-1.3.0+dfsg/mixgtk/mixgtk_gen_handlers.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_gen_handlers.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_gen_handlers.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_gen_handlers.c : * Implementation of the functions declared in mixgtk_gen_handlers.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,8 +40,8 @@ (gtk_file_chooser_dialog_new ("gmixvm", NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL)); src_filter = gtk_file_filter_new (); gtk_file_filter_add_pattern (src_filter, "*.mixal"); @@ -185,7 +185,8 @@ void on_save_on_exit_toggle (GtkWidget *w, gpointer data) { - mixgtk_config_set_autosave (GTK_CHECK_MENU_ITEM (w)->active); + gboolean active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (w)); + mixgtk_config_set_autosave (active); } void @@ -193,5 +194,3 @@ { mixgtk_config_save (); } - - diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk.glade mdk-1.3.0+dfsg/mixgtk/mixgtk.glade --- mdk-1.2.11+dfsg/mixgtk/mixgtk.glade 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk.glade 2020-10-19 23:50:09.000000000 +0000 @@ -1,2424 +1,2395 @@ - - - - - - gmixvm - gmixvm-main - 650 - 550 - - + + + + + + False + 2 + About gmixvm + False + True + center-on-parent + dialog + + + + + + + + True - 2 + False vertical - 2 + + + True + False + spread + + + gtk-ok + True + True + True + True + True + False + 1 + True + + + + True + False + 0 + + + + + False + False + end + 0 + + - + True + False + 3 + 0 + 0 - + True - _File - True + False - + + True + False + 15 + vertical + 10 - - _Load + True - Load a MIX file - True - False - - - - - True - gtk-open - - - + False + <b>MIX virtual machine</b> +<small>(GNU MDK)</small> + True + center + 0 + + + True + True + 0 + - - gtk-edit + + 52 + 16 True - Edit a MIXAL source file - True - True - - - + False + label223 + center + 0 + + + True + False + 1 + - - _Compile + True - Compile a MIXAL source file - True - False - - - - - True - gtk-execute - - - + True + <a href="http://www.gnu.org/software/mdk/mdk.html">www.gnu.org/software/mdk</a> + True + center + True + 0 + + + False + False + 2 + - + True - + True + <small>Please send bug reports to bug-mdk@gnu.org</small> + True + center + True + True + 0 + + + True + False + 3 + - - E_xit + True - Exit application - True - False - - - - - True - gtk-quit - - - + False + <small>Copyright (C) 2000-2020 +Free Software Foundation, Inc</small> + True + center + 0 + + + False + False + 4 + - + - + + + + + False + True + 1 + + + + + + okbutton2 + + + + False + Devices directory + False + True + center + dialog + + + + + + + + + True + False + vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + + True + False + 0 + - + + gtk-ok True - De_bug - True - - - - - _Run - True - Run program - True - False - - - - - True - gtk-media-play - - - - - - - _Next - True - Execute next instruction - True - False - - - - - True - gtk-media-next - - - - - - - _Clear breakpoints - True - Clear all set breakpoints - True - False - - - - - True - gtk-clear - - - - - - - _Symbols - True - Show the symbol table - True - False - - - - - True - gtk-index - - - - - - - + True + True + False + True + + + + True + False + 1 + + + + + False + False + end + 0 + + + + + True + False + 25 + 11 + + + True + False + Directory + center + + + False + False + 0 + - + True - Vie_w + False + False + False + False + False + False + + + True + True + 1 + + + + + _Select + True + True + False True - - - - - _Toolbars - True - True - False - - - - - True - _Show Toolbars - True - - - - - True - _Style - True - - - - - True - Show only icons in toolbar buttons - _Icons - True - True - - - - - True - Show only labels in toolbar buttons - _Labels - True - True - tb_style_icons - - - - - True - Show both icons and labels in toolbar buttons - _Both - True - True - tb_style_icons - - - - - True - _Sideways - True - True - tb_style_icons - - - - - - - - - - - True - gtk-preferences - - - - - - - _Detached windows - True - True - False - - - - - True - _Virtual machine - True - - - - - True - _Source - True - - - - - True - _Devices - True - - - - - - - True - gtk-dnd-multiple - - - - - - - + + + + False + False + 2 + + + + False + True + 2 + + + + + + devdir_cancel + devdir_ok + + + + False + Device output format + False + True + center-on-parent + 320 + dialog + + + + + + + + + True + False + vertical + + + True + False + end - + + gtk-cancel True - S_ettings + True + True + False + True + + + True + False + 0 + + + + + gtk-apply + True + True + True + False + True + + + True + False + 1 + + + + + gtk-ok + True + True + True + False + True + + + True + False + 2 + + + + + False + False + end + 0 + + + + + True + False + + + S_et all + 0 + 0 + True + True + False True - - - - - Change _font - True - True - False - - - - - True - _Virtual machine - True - - - - - - True - _Source - True - - - - - - True - Command _prompt - True - - - - - - True - Command l_og - True - - - - - - True - _Devices - True - - - - - - True - Symbol _list - True - - - - - - True - - - - - True - Change all fonts at once - _All - True - - - - - - - - True - gtk-select-font - - - - - - - _Device output - True - Change format of binary devices output - True - False - - - - True - gtk-directory - - - - - - - De_vices dir - True - True - False - - - - True - gtk-home - - - - - - - E_xternal programs - True - True - False - - - - True - gtk-execute - - - - - - - True - - - - - _Save - True - Save current settings - True - False - - - - True - gtk-save - - - - - - - True - Toogle save settings on exit - Save on _exit - True - - - - + + + + 241 + 34 + + + + + 0 + 0 + True + False + Device + center + + + 24 + 10 + + + + + 0 + 0 + True + False + Format + center + + + 24 + 38 + + + + + Word + 0 + 0 + True + True + False + True + True + + + 89 + 34 + + + + + Decimal + 0 + 0 + True + True + False + True + True + wordradio + + + + 154 + 34 + + + + + 100 + True + False + 0 + True + + tape0 + tape1 + tape2 + tape3 + tape4 + tape5 + tape6 + tape7 + disk0 + disk1 + disk2 + disk3 + disk4 + disk5 + disk6 + disk7 + + + + + False + tape0 + - + + + 94 + 3 + + + + + False + False + 5 + 1 + + + + + + button37 + button38 + button39 + + + + False + Devices + 550 + 250 + + + + + + + + + True + False + vertical + + + True + False + True + 2 + icons + + + True + False + True + Directory + True + gtk-home + + + + False + True + - + True - _Help + False + True + Output True - - - - - _About - True - True - False - - - - True - gtk-about - - - - - - - + gtk-zoom-100 + + + + False + True + + + + + True + False + + + False + False + + + + + True + False + True + Font + True + gtk-select-font + + + + False + True + + + + + True + False + + + False + False + + + + + True + False + True + Attach + True + gtk-dnd-multiple + + + False + True + - + False + True 0 - + + True + False + vertical + + + True + True + 1 + + + + + + + False + 1 + External programs + False + True + center-on-parent + dialog + + + + + + + + + True + False + vertical + + True + False + end - + + gtk-cancel True - icons - - - True - Load MIX program - True - Open - True - gtk-open - - - - False - True - - - - - True - Compile MIXAL source - True - Compile - True - gtk-execute - - - - False - True - - - - - True - Edit MIXAL source - True - Edit - True - gtk-justify-fill - - - - False - True - - - - - True - - - False - - - - - True - Run - True - Run - True - gtk-go-forward - - - - False - True - - - - - True - Next - True - Next - True - gtk-goto-last - - - - False - True - - - - - True - Clear breakpoints - True - Clear - True - gtk-clear - - - - False - True - - - - - True - Symbol table - True - Symbols - True - gtk-index - - - - False - True - - - - - True - - - False - - - - - True - Device directory - Devdir - True - gtk-home - - - - False - True - - - - - True - Output format - Format - True - gtk-zoom-100 - - - - False - True - - - - - True - External programs - Programs - True - gtk-properties - - - - False - True - - + True + True + False + True + + + True + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + True + False + 1 + + + + + False + False + end + 0 + + + + + True + False + vertical + True + + + True + False + 9 - + + 0 + 0 True - + True + -e vi %s + - False + 168 + 24 - + + 0 + 0 True - Detach window - Detach - True - gtk-dnd-multiple - - + False + Editor command and arguments (e.g -e vi %s) + - False - True + 8 - + + 151 + 31 True - Attach all windows - True - Attach - True - gtk-dnd - - - - False - True - - - - - - - False - False - 3 - 1 - - - - - True - True - 1 - - - True - True - + False + False + False + + + 8 + 24 + + + - True - False + True + True + 0 - + True - vertical + False + 9 - + + 0 + 0 True False - automatic - automatic - in - - - True - False - word - 3 - 4 - - - + MIX asssembler path + True + 0.47999998927116394 + 0.52999997138977051 + - 0 + 8 + 8 + + + + + 151 + 31 + True + False + False + False + False + Select mixasm executable + + + 8 + 32 - + + Generate listing file + 152 + 24 True True - True - Enter MIXVM command here - - - + False + False + True + True + - False - False - 1 + 176 + 32 - + - True - True + True + True + 1 - + + False + True 2 - - - True - + + + + button40 + button41 + + + + False + dialog + en-gb + + + + + + False + vertical + 2 + + + False + end + False False - 3 + 0 - + - - - Enter value + + + False + Memory cell False True - mouse dialog - - - + + + - - True + + False vertical - - - True - 5 - - - 0 - 0 - True - True - True - GDK_KEY_PRESS_MASK - 28 - 0 - - - - 88 - 64 - - - - - 0 - 0 - True - True - GDK_KEY_PRESS_MASK - 2 - 3 - 0 - - - - 144 - 32 - - - - - 0 - 0 - True - True - GDK_BUTTON_PRESS_MASK - 2 - 3 - 0 - - - - 176 - 32 - - + 2 + + + False + end - - 0 - 0 + + gtk-cancel True True - GDK_KEY_PRESS_MASK - 2 - 3 - 0 - - + False + True + - 208 - 32 + True + True + 0 - - 0 - 0 + + gtk-ok True True - GDK_KEY_PRESS_MASK - 2 - 3 - 0 - - + True + True + False + True + - 238 - 32 + True + True + 1 + + + False + False + 0 + + + + + True + False + vertical + 5 - - 0 - 0 + True - True - GDK_KEY_PRESS_MASK - 2 - 3 - 0 - - + False + Go to address + - 112 - 32 + False + True + 0 - - 0 - 0 + True True - GDK_KEY_PRESS_MASK - 1 - 2 - + - - - - 88 - 32 - - - - - 0 - 0 - True - Decimal - center - - - 14 - 68 - - - - - 0 - 0 - True - Bytes - center - - - 15 - 36 - - - - - 0 - 0 - True - Enter value - center - + True + 4 + True + 6 + 6 + 0.5 + False + digits + - 112 - 8 + False + False + 1 - + - 2 + False + False + 1 + + + + goto_cancel + goto_ok + + + + False + MIX Console input + False + True + center-on-parent + dialog + + + + + + + + True + False + vertical - + True + False end - - gtk-cancel - -6 + + gtk-ok True True True + True False True - - + - False + True False 0 + + + False + False + end + 0 + + + + + True + False + 3 + vertical + True - - gtk-clear + True - True - True - False - True - False - - + False + Enter up to 70 characters + False False - 1 + 0 - - gtk-ok - -5 + True True - True - False - True - - + 70 + True + 70 + False False - 2 + 1 - + False False - end - 0 + 2 - + - - - Go to memory cell - False - True - mouse - dialog - - - - - + + okbutton1 + + + + False + gmixvm + gmixvm-main + 650 + 550 + + + + + True + False + 2 vertical + 2 - + True - 12 - vertical + False - + True - Go to address: - center - - - 0 - + False + _File + True + + + False + + + _Load + True + False + True + False + + + + + + + gtk-edit + True + False + True + True + + + + + + + _Compile + True + False + True + False + + + + + + + True + False + + + + + gtk-quit + True + False + True + True + + + + + + + + + + + True + False + De_bug + True + + + False + + + _Run + True + False + True + False + + + + + + + _Next + True + False + True + False + + + + + + + _Clear breakpoints + True + False + True + False + + + + + + + _Symbols + True + False + True + False + + + + + + + + + + + True + False + Vie_w + True + + + False + + + _Toolbars + True + False + True + False + + + False + + + True + False + _Show Toolbars + True + + + + + True + False + _Style + True + + + False + + + True + False + _Icons + True + True + + + + + True + False + _Labels + True + True + tb_style_icons + + + + + True + False + _Both + True + True + tb_style_icons + + + + + True + False + _Sideways + True + True + tb_style_icons + + + + + + + + + + + + + _Detached windows + True + False + True + False + + + False + + + True + False + _Virtual machine + True + + + + + True + False + _Source + True + + + + + True + False + _Devices + True + + + + + + + + + + + + + True + False + S_ettings + True + + + False + + + Change _font + True + False + True + False + + + False + + + True + False + _Virtual machine + True + + + + + + True + False + _Source + True + + + + + + True + False + Command _prompt + True + + + + + + True + False + Command l_og + True + + + + + + True + False + _Devices + True + + + + + + True + False + Symbol _list + True + + + + + + True + False + + + + + True + False + _All + True + + + + + + + + + + _Device output + True + False + True + False + + + + + + De_vices dir + True + False + True + False + + + + + + E_xternal programs + True + False + True + False + + + + + + True + False + + + + + _Save + True + False + True + False + + + + + + True + False + Save on _exit + True + + + + + + - + True - True - True - True - - - False - False - 10 - 1 - + False + _Help + True + + + False + + + _About + True + False + True + False + + + + + + - + False - False - 2 + True + 0 - - + + True - end + False + icons - - gtk-cancel - -6 + True - True - True - False - True - + False + True + Open + True + gtk-open + + False - False - 0 + True - - gtk-ok - -5 + True - True - True - True - False - True - + False + True + Compile + True + gtk-execute + + False - False - 1 + True - - - False - end - 0 - - - - - - - 4 - Select Font - True - center-on-parent - dialog - - - - - - True - 4 - - - - - True - True - True - False - - - - - True - True - True - False - - - - - True - True - True - False - - - - - Device output format - True - center-on-parent - 320 - 140 - dialog - - - - - - True - vertical - - - True - - S_et all - 0 - 0 + True - True - False - Set all devices to current format + False + True + Edit True - - - - 233 - 31 - - - - - 0 - 0 - True - Device - center - + gtk-justify-fill + + - 24 - 10 + False + True - - 0 - 0 + True - Format - center - - - 24 - 38 - - - - - 183 - 25 - True - tape0 -tape1 -tape2 -tape3 -tape4 -tape5 -tape6 -tape7 -disk0 -disk1 -disk2 -disk3 -disk4 -disk5 -disk6 -disk7 - - + False + - 90 - 2 + False + False - - Word - 0 - 0 + True - True - False - Show output as MIX words + False + True + Run True - True - + gtk-go-forward + + - 89 - 34 + False + True - - Decimal - 0 - 0 + True - True - False - Show output as decimal numbers + False + True + Next True - True - wordradio - - - - 154 - 34 - - - - - False - end - 2 - - - - - True - end - - - gtk-cancel - -6 - True - True - True - False - True - + gtk-goto-last + + False - False - 0 + True - - gtk-apply - -10 + True - True - True - False - True - + False + True + Clear + True + gtk-clear + + False - False - 1 + True - - gtk-ok - -5 + True - True - True - False - True - + False + True + Symbols + True + gtk-index + + False - False - 2 + True - - - False - end - 0 - - - - - - - 1 - External programs - False - True - center-on-parent - dialog - - - - - - True - vertical - - - True - vertical - True - + True - 9 - - - 0 - 0 - True - True - Enter the arguments for the editor. %s will be substituted by the full path to the MIXAL file to edit. - -e vi %s - - - 168 - 24 - - - - - 0 - 0 - True - Editor command and arguments (e.g -e vi %s) - - - 8 - - - - - 151 - 31 - True - False - False - - - 8 - 24 - - - + False + - 0 - - - - - True - 9 - - - 0 - 0 - True - 0.47999998927116394 - 0.52999997138977051 - MIX asssembler path - True - - - 8 - 8 - - - - - 151 - 31 - True - False - False - Select mixasm executable - - - 8 - 32 - - - - - Generate listing file - 152 - 24 - True - True - False - If checked, mixasm will be called with the --listing flag. - True - False - True - - - 176 - 32 - - - + False + False + + + + + True + False + Devdir + True + gtk-home + + - 1 + False + True - - - 2 - - - - - True - end - - gtk-cancel - -6 + True - True - True - False - True - + False + Format + True + gtk-zoom-100 + + False - False - 0 + True - - gtk-ok - -5 + True - True - True - False - True - + False + Programs + True + gtk-preferences + + False - False - 1 + True - - - False - end - 0 - - - - - - - Symbol table - 245 - 265 - dialog - - - - - - True - vertical - - - True - False - automatic - automatic - in - + True - True - False - True - True - + False + + + False + False + - - - 2 - - - - - True - end - + True - True - False - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-close - - - False - False - 0 - - - - - True - _Close - True - - - False - False - 1 - - - - - - - + False + Detach + True + gtk-dnd-multiple + + False - False - 0 + True - - - False - end - 0 - - - - - - - MIXAL source - 570 - 225 - - - True - vertical - - - True - + True - True - 2 - icons - - - True - Run - True - Run - True - gtk-go-forward - - - - False - True - - - - - True - Next - True - Step - True - gtk-goto-last - - - - False - True - - - - - True - Clear breakpoints - True - Clear - True - gtk-clear - - - - False - True - - - - - True - Symbol table - True - Symbols - True - gtk-index - - - - False - True - - - - - True - - - False - - - - - True - Source code font - True - Font - True - gtk-select-font - - - - False - True - - - - - True - - - False - - - - - True - Attach window - True - Attach - True - gtk-dnd - - - False - True - - - + False + True + Attach + True + gtk-revert-to-saved + + + + False + True + - + False - False - 0 + True + 1 - + True + True + vertical + 1 - + + True + True + True + True + + + True + False + - - - 1 - - - - - True - - - False - False - 2 - - - - - - - Devices - 550 - 250 - - - - - - True - vertical - - - True - + True - True - 2 - icons - - - True - Device directory - True - Directory - True - gtk-home - - - - False - True - - - - - True - Output format - True - Output - True - gtk-zoom-100 - - - - False - True - - - - - True - - - False - - - - - True - Change output font - True - Font - True - gtk-select-font - - - - False - True - - + False + vertical - + True - + False + in + 10 + + + True + False + False + word + 3 + 4 + True + + + - False + True + True + 0 - + True - Attach window - True - Attach - True - gtk-dnd - + True + True + + + False - True + False + 1 - + + + True + True + - + - False - False - 0 + True + True + 2 - + True - - - - + False + False + end + bottom + - 1 + False + False + 3 - + - - - Devices directory - False - True - center - dialog - - - - - + + + False + MIXAL source + 570 + 225 + + + + + True + False vertical - + True - 25 - 11 + False + True + 2 + icons + + + True + False + True + Run + True + gtk-go-forward + + + + False + True + + - + True - Directory - center - + False + True + Step + True + gtk-goto-last + + False - False - 0 + True - + True - True - False - + False + True + Clear + True + gtk-clear + + - 1 + False + True - - gtk-open + True - True - False - True - - + False + True + Symbols + True + gtk-index + + False - False - 2 + True - - - False - 2 - - - - - True - end - - gtk-cancel - -6 + True - True - True - False - True - - + False + False - False - 0 + False - - gtk-ok - -5 + True - True - True - False - True - - + False + True + Font + True + gtk-select-font + + False - False - 1 + True + + + + + True + False + + + False + False + + + + + True + False + True + Attach + True + gtk-dnd-multiple + + + False + True - + False - False - end + True 0 - + + + True + False + vertical + + + True + True + 1 + + + + + True + False + + + False + False + 2 + + + - - + + + False Virtual machine 640 268 + + + - + True + False vertical - + True + False + True + icons - + True - True - icons - - - True - Change font - True - Font - True - gtk-select-font - - - - False - True - - - - - True - - - False - - - - - True - Attach window - True - Attach - True - gtk-dnd - - - False - True - - - + False + True + Font + True + gtk-select-font + + + + False + True + + + + + True + False + + + False + False + + + + + attach_button + True + False + True + Attach + True + gtk-dnd-multiple + + + False + True + + + + + menu-bar + - + False - False + True 0 - + True + False 5 0 - + True + False - + True + False 1 vertical 1 - + True + False 2 0 - + True + False 8 3 6 11 6 - + 0 0 True + False A center - + GTK_FILL - + - + 0 0 True + False I1 center - + 2 3 GTK_FILL - + - + 0 0 True + False I2 center - + 2 3 1 2 GTK_FILL - + - + 0 0 True + False True True False 19 - - + + 1 2 - - + + - + 0 0 True True False 9 - - + + 3 4 1 2 - - + + - + 0 0 True True False 9 - - + + 3 4 - - + + - + 0 0 True + False X center - + 1 2 GTK_FILL - + - + 16 16 True + False I3 center - + 2 3 2 3 GTK_FILL - + - + 0 0 True + False I4 center - + 4 5 GTK_FILL - + - + 16 16 True + False I5 center - + 4 5 1 2 GTK_FILL - + - + 16 16 True + False I6 center - + 4 5 2 3 GTK_FILL - + - + 0 0 True + False J center - + 2 3 GTK_FILL - + - + 0 0 True True False 19 - - + + 1 2 1 2 - - + + - + 0 0 True True False 9 - - + + 5 6 - - + + - + 0 0 True True False 9 - - + + 5 6 1 2 - - + + - + 0 0 True True False 9 - - + + 5 6 2 3 - - + + - + 0 0 True True False 9 - - + + 3 4 2 3 - - + + - + True + False - + 0 0 True True False 9 - - + + False False 0 - - - - + 1 2 @@ -2428,52 +2399,45 @@ GTK_FILL - - - - - True - 2 - Registers - - - label_item - + - + False + True 5 0 - + True + False - + True + False 2 0 - + True + False 1 5 - + G 0 0 True True False - Greater 2 True True - - + + False False @@ -2481,20 +2445,19 @@ - + E 0 0 True True False - Equal 2 True True greater_radio - - + + False False @@ -2502,20 +2465,19 @@ - + L 0 0 True True False - Lesser 2 True True greater_radio - - + + False False @@ -2523,10 +2485,11 @@ - + 7 True - + False + False False @@ -2534,34 +2497,24 @@ - + Overflow True True False True True - - + + False False 4 - - - - - True - 2 - Flags - - - label_item - + - + False False @@ -2569,20 +2522,19 @@ - - - - + True + False 2 0 - + True + False 4 1 - + 0 0 True @@ -2591,7 +2543,7 @@ 4 6 0 - + False False @@ -2600,19 +2552,19 @@ - + True True False - View loc address - + - + True + False gtk-jump-to - + - + False False @@ -2620,19 +2572,9 @@ 1 - - - - - True - 2 - Location - - - label_item - + - + False False @@ -2640,31 +2582,35 @@ 2 - + False + True 5 1 - + True + False 2 0 - + True + False 5 5 True - + 0 0 True + False Uptime: - + False False @@ -2672,14 +2618,15 @@ - + 0 0 True + False 5 00000000 center - + False False @@ -2687,12 +2634,13 @@ - + 0 0 True + False Elapsed: - + False False @@ -2701,14 +2649,15 @@ - + 0 0 True + False 5 000000 center - + False False @@ -2716,12 +2665,13 @@ - + 0 0 True + False Program: - + False False @@ -2730,41 +2680,32 @@ - + 0 0 True + False 5 000000 center - + False False 5 - + - - - True - 2 - Times - center - - - label_item - - - + False + True 5 2 - + False False @@ -2773,292 +2714,421 @@ - + True + False 7 0 - + True True 5 - automatic - automatic in - + True True GDK_BUTTON_PRESS_MASK True - + + + + - - - - - True - 2 - Memory - - - label_item - + - + + True + True 3 end 1 - + + + + True + True + 1 + + + + + + + False + Symbol table + 245 + 265 + dictionary + dialog + + + + + + + + + True + False + vertical + + + True + False + end - + True - 2 - MIX Virtual Machine - + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-close + + + False + False + 0 + + + + + True + False + _Close + True + + + False + False + 1 + + + + + + + - label_item + True + False + 0 - + - 1 + False + False + end + 0 + + + + + True + False + in + + + True + True + False + True + True + + + + + + + + False + True + 2 - + - - - True - MIX Console input + + + False + Enter value False True - center-on-parent + mouse dialog - - + + + + + + - + True + False vertical - - + 2 + + True - 3 - vertical - True + False + end - + + gtk-cancel True - Enter up to 70 characters - + True + True + False + True + + - False + True False 0 - + + gtk-clear True True - 70 - True - 70 - + False + True + False + True + + - False + True False 1 - - - False - False - 2 - - - - - True - end - + gtk-ok - -5 True True True - True False True - + + - False + True False - 0 + 2 - + False + False end 0 - - - - - 2 - About gmixvm - False - True - center-on-parent - dialog - False - - - - - - True - vertical - + True - 3 - 0 - 0 + False + 5 - + + 0 + 0 True - - - True - 15 - vertical - 10 - - - True - 0 - <b>MIX virtual machine</b> -<small>(GNU MDK)</small> - True - center - - - 0 - - - - - 52 - 16 - True - 0 - label223 - center - - - False - 1 - - - - - True - True - 0 - http://www.gnu.org/software/mdk/mdk.html - True - center - True - - - False - False - 2 - - - - - True - True - 0 - <small>Please send bug reports to bug-mdk@gnu.org</small> - True - center - True - True - - - False - 3 - - - - - True - 0 - <small>Copyright (C) 2001-2009 -Free Software Foundation, Inc</small> - True - center - - - False - False - 4 - - - - - + True + True + GDK_KEY_PRESS_MASK + 28 + 0 + + + + 88 + 64 + - - - 1 - - - - - True - spread - - gtk-ok - -5 + + 0 + 0 True True - True - True - True - False - 1 - True - - + GDK_KEY_PRESS_MASK + 2 + 3 + 0 + + - False - False - 0 + 144 + 32 + + + + + 0 + 0 + True + True + GDK_BUTTON_PRESS_MASK + 2 + 3 + 0 + + + + 176 + 32 + + + + + 0 + 0 + True + True + GDK_KEY_PRESS_MASK + 2 + 3 + 0 + + + + 208 + 32 + + + + + 0 + 0 + True + True + GDK_KEY_PRESS_MASK + 2 + 3 + 0 + + + + 238 + 32 - + + + 0 + 0 + True + True + GDK_KEY_PRESS_MASK + 2 + 3 + 0 + + + + 112 + 32 + + + + + 0 + 0 + True + True + GDK_KEY_PRESS_MASK + 1 + 2 + + + + + + 88 + 32 + + + + + 0 + 0 + True + False + Decimal + center + + + 14 + 68 + + + + + 0 + 0 + True + False + Bytes + center + + + 15 + 36 + + + + + 0 + 0 + True + False + Enter value + center + + + 112 + 8 + + + False - end - 0 + True + 2 - + - - + + word_cancel + word_ok + + + diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_input.c mdk-1.3.0+dfsg/mixgtk/mixgtk_input.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_input.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_input.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_input.c : * Implementation of the functions declared in mixgtk_input.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -136,14 +136,14 @@ mix_word_t w = mix_word_new (atoi (gtk_entry_get_text (GTK_ENTRY (childs_[DEC_])))); - g_signal_handlers_block_by_func (GTK_OBJECT (sign), + g_signal_handlers_block_by_func (sign, on_word_sign_changed, data); if (txt[0] != '+' && txt[0] != '-') txt[0] = '+'; gtk_editable_delete_text (sign, 0, 1); gtk_editable_insert_text (sign, txt, 1, &pos); - g_signal_handlers_unblock_by_func (GTK_OBJECT (sign), + g_signal_handlers_unblock_by_func (sign, on_word_sign_changed, data); set_word_ (txt[0] == '-' ? mix_word_negative (w) : w); } @@ -185,8 +185,7 @@ g_assert (dialog_ != NULL); for (k = 0; k < SIZE_; ++k) { - childs_[k] = mixgtk_widget_factory_get_child_by_name - (MIXGTK_WORD_DIALOG, WGT_NAMES_[k]); + childs_[k] = mixgtk_widget_factory_get_by_name (WGT_NAMES_[k]); g_assert (childs_[k] != NULL); } } @@ -202,13 +201,10 @@ g_snprintf (BUFFER, SIZE, "%s%d", neg ? "-" : "", val); - g_signal_handlers_block_by_func (GTK_OBJECT (childs_[DEC_]), - on_word_dec_changed, NULL); - g_signal_handlers_block_by_func (GTK_OBJECT (childs_[SIGN_]), - on_word_sign_changed, NULL); + g_signal_handlers_block_by_func (childs_[DEC_], on_word_dec_changed, NULL); + g_signal_handlers_block_by_func (childs_[SIGN_], on_word_sign_changed, NULL); for (k = B1_; k <= B5_; ++k) - g_signal_handlers_block_by_func (GTK_OBJECT (childs_[k]), - on_word_byte_changed, NULL); + g_signal_handlers_block_by_func (childs_[k], on_word_byte_changed, NULL); gtk_entry_set_text (GTK_ENTRY (childs_[DEC_]), BUFFER); gtk_entry_set_text (GTK_ENTRY (childs_[SIGN_]), neg ? "-" : "+"); @@ -221,11 +217,7 @@ } for (k = B1_; k <= B5_; ++k) - g_signal_handlers_unblock_by_func (GTK_OBJECT (childs_[k]), - on_word_byte_changed, NULL); - g_signal_handlers_unblock_by_func (GTK_OBJECT (childs_[DEC_]), - on_word_dec_changed, NULL); - g_signal_handlers_unblock_by_func (GTK_OBJECT (childs_[SIGN_]), - on_word_sign_changed, NULL); + g_signal_handlers_unblock_by_func (childs_[k], on_word_byte_changed, NULL); + g_signal_handlers_unblock_by_func (childs_[DEC_], on_word_dec_changed, NULL); + g_signal_handlers_unblock_by_func (childs_[SIGN_], on_word_sign_changed, NULL); } - diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_mixal.c mdk-1.3.0+dfsg/mixgtk/mixgtk_mixal.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_mixal.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_mixal.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_mixal.c : * Implementation of the functions declared in mixgtk_mixal.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,8 +42,8 @@ static GtkListStore *symbols_store_ = NULL; static const gchar *SYMBOLS_VIEW_NAME_ = "symbols_view"; -static const gchar *bp_stock_id_ = NULL; -static const gchar *pc_stock_id_ = NULL; +static const gchar *bp_stock_id_ = "gtk-stop"; +static const gchar *pc_stock_id_ = "gtk-go-forward"; static const guint bp_stock_size_ = GTK_ICON_SIZE_MENU; enum { @@ -77,8 +77,7 @@ symbols_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_SYMBOLS_DIALOG); g_assert (symbols_dlg_); symbols_view_ = GTK_TREE_VIEW - (mixgtk_widget_factory_get_child_by_name - (MIXGTK_SYMBOLS_DIALOG, SYMBOLS_VIEW_NAME_)); + (mixgtk_widget_factory_get_by_name (SYMBOLS_VIEW_NAME_)); g_assert (symbols_view_); mixgtk_fontsel_set_font (MIX_FONT_SYMBOLS, GTK_WIDGET (symbols_view_)); @@ -148,7 +147,6 @@ static void init_clist_ (void) { - GtkStockItem item; GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); GtkCellRenderer *bprenderer = gtk_cell_renderer_pixbuf_new (); @@ -166,7 +164,7 @@ gtk_tree_view_set_model (clist_, GTK_TREE_MODEL (clist_store_)); g_object_unref (G_OBJECT (clist_store_)); - gtk_tree_view_set_rules_hint (clist_, TRUE); + // gtk_tree_view_set_rules_hint (clist_, TRUE); gtk_tree_view_append_column (clist_, @@ -190,16 +188,6 @@ "text", CLIST_CODE_COL, NULL)); - if (gtk_stock_lookup (GTK_STOCK_STOP, &item)) - { - bp_stock_id_ = item.stock_id; - } - - if (gtk_stock_lookup (GTK_STOCK_GO_FORWARD, &item)) - { - pc_stock_id_ = item.stock_id; - } - symbols_dlg_ = NULL; symbols_view_ = NULL; diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_mixvm.c mdk-1.3.0+dfsg/mixgtk/mixgtk_mixvm.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_mixvm.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_mixvm.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_mixvm.c : * Implementation of the functions declared in mixgtk_mixvm.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008, 2019 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -258,31 +258,37 @@ /* update cmp flag */ +static gboolean +button_active_ (GtkWidget *widget) +{ + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); +} + void on_cmp_e_toggled (GtkWidget *widget, gpointer data) { - if (GTK_TOGGLE_BUTTON (widget)->active) + if (button_active_ (widget)) mix_vm_set_cmpflag (vm_, mix_EQ); } void on_cmp_l_toggled (GtkWidget *widget, gpointer data) { - if (GTK_TOGGLE_BUTTON (widget)->active) + if (button_active_ (widget)) mix_vm_set_cmpflag (vm_, mix_LESS); } void on_cmp_g_toggled (GtkWidget *widget, gpointer data) { - if (GTK_TOGGLE_BUTTON (widget)->active) + if (button_active_ (widget)) mix_vm_set_cmpflag (vm_, mix_GREAT); } void on_overflow_toggled (GtkWidget *widget, gpointer data) { - mix_vm_set_overflow (vm_, GTK_TOGGLE_BUTTON (widget)->active); + mix_vm_set_overflow (vm_, button_active_ (widget)); } void @@ -532,4 +538,3 @@ return TRUE; } - diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_widgets.c mdk-1.3.0+dfsg/mixgtk/mixgtk_widgets.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_widgets.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_widgets.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_widgets.c : * Implementation of the functions declared in mixgtk_widgets.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2004, 2006, 2007, 2014 Free Software Foundation, Inc. + * Copyright (C) 2001, 2004, 2006, 2007, 2014, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ #include -#include #include #include "mixgtk_config.h" #include "mixgtk_widgets.h" @@ -84,18 +83,11 @@ #define WIDGET_NO_ (sizeof (names_) / sizeof (names_[0])) /* the glade specs */ -static GladeXML *xml_[DLG_NO_] = {NULL}; +static GtkBuilder *builder_ = NULL; /* the xml file name */ static const gchar *file_ = NULL; -static void init_xml_ (mixgtk_dialog_id_t dlg) -{ - xml_[dlg] = glade_xml_new (file_, dnames_[dlg], NULL); - glade_xml_signal_autoconnect (xml_[dlg]); - g_assert (xml_[dlg] != NULL); -} - /* create a new factory from an xml glade file */ gboolean mixgtk_widget_factory_init (void) @@ -103,20 +95,16 @@ if (!file_) { const gchar *glade_file = GLADE_FILE; - glade_init (); if (access (glade_file, R_OK)) { if (access (LOCAL_GLADE_FILE, R_OK)) return FALSE; glade_file = LOCAL_GLADE_FILE; } file_ = g_strdup (glade_file); - } - else - { - gint k; - for (k = 0; k < DLG_NO_; ++k) if (xml_[k]) xml_[k] = NULL; + builder_ = gtk_builder_new_from_file (file_); + g_assert (builder_); + gtk_builder_connect_signals (builder_, NULL); } - init_xml_ (MIXGTK_MAIN); return TRUE; } @@ -126,7 +114,7 @@ { g_assert ((long)widget < WIDGET_NO_); - return mixgtk_widget_factory_get_child_by_name (dlg, names_[widget]); + return mixgtk_widget_factory_get_by_name (names_[widget]); } @@ -134,17 +122,14 @@ mixgtk_widget_factory_get_dialog (mixgtk_dialog_id_t dlg) { g_assert (dlg < DLG_NO_); - - if (!xml_[dlg]) init_xml_ (dlg); - return glade_xml_get_widget (xml_[dlg], dnames_[dlg]); + return GTK_WIDGET (gtk_builder_get_object (builder_, dnames_[dlg])); } GtkWidget * -mixgtk_widget_factory_get_child_by_name (mixgtk_dialog_id_t dlg, - const gchar *name) +mixgtk_widget_factory_get_by_name (const gchar *name) { - g_assert (dlg < DLG_NO_); g_assert (name != NULL); - if (!xml_[dlg]) init_xml_ (dlg); - return glade_xml_get_widget (xml_[dlg], name); + GtkWidget *w = GTK_WIDGET (gtk_builder_get_object (builder_, name)); + if (!w) g_warning ("Widget '%s' not found", name); + return w; } diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_widgets.h mdk-1.3.0+dfsg/mixgtk/mixgtk_widgets.h --- mdk-1.2.11+dfsg/mixgtk/mixgtk_widgets.h 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_widgets.h 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- ---------------- mixgtk_widgets.h : * glade-based factory of mixvm widgets * ------------------------------------------------------------------ - * Copyright (C) 2001, 2004, 2006, 2007 Free Software Foundation, Inc. + * Copyright (C) 2001, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -94,8 +94,6 @@ /* Get a widget by name */ extern GtkWidget * -mixgtk_widget_factory_get_child_by_name (mixgtk_dialog_id_t dlg, - const gchar *name); +mixgtk_widget_factory_get_by_name (const gchar *name); #endif /* MIXGTK_WIDGETS_H */ - diff -Nru mdk-1.2.11+dfsg/mixgtk/mixgtk_wm.c mdk-1.3.0+dfsg/mixgtk/mixgtk_wm.c --- mdk-1.2.11+dfsg/mixgtk/mixgtk_wm.c 2019-03-11 02:48:02.000000000 +0000 +++ mdk-1.3.0+dfsg/mixgtk/mixgtk_wm.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_wm.c : * Implementation of the functions declared in mixgtk_wm.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,6 +40,8 @@ GtkCheckMenuItem *menu; const gchar *menu_name; const gchar *config_key; + const gchar *toolbar_name; + const gchar *attach_button; gboolean detached; void (*detach) (void); void (*attach) (void); @@ -82,17 +84,21 @@ static void mixal_detach_ (void); static void dev_attach_ (void); static void dev_detach_ (void); +static void reparent_ (GtkWidget *widget, GtkWidget *parent); static void update_attach_buttons_ (void); static void on_tb_style_ (GtkMenuItem *w, gpointer style); static void on_nb_switch_ (GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data); static window_info_t_ infos_[] = { - {MIXGTK_MIXVM_DIALOG, NULL, NULL, "detach_vm", "MIX.detach", + {MIXGTK_MIXVM_DIALOG, NULL, NULL, + "detach_vm", "MIX.detach", "mixvm_toolbar", "attach_button_mixvm", FALSE, mixvm_detach_, mixvm_attach_}, - {MIXGTK_MIXAL_DIALOG, NULL, NULL, "detach_source", "MIXAL.detach", + {MIXGTK_MIXAL_DIALOG, NULL, NULL, + "detach_source", "MIXAL.detach", "mixal_toolbar", "attach_button_mixal", FALSE, mixal_detach_, mixal_attach_}, - {MIXGTK_DEVICES_DIALOG, NULL, NULL, "detach_dev", "Devices.detach", + {MIXGTK_DEVICES_DIALOG, NULL, NULL, + "detach_dev", "Devices.detach", "dev_toolbar", "attach_button_dev", FALSE, dev_detach_, dev_attach_} }; @@ -197,10 +203,10 @@ for (k = 0; k < INF_NO_; ++k) if (item == infos_[k].menu) break; g_return_if_fail (k < INF_NO_); - if (item->active) mixgtk_wm_detach_window (k); + gboolean active = gtk_check_menu_item_get_active (item); + if (active) mixgtk_wm_detach_window (k); else mixgtk_wm_attach_window (k); - mixgtk_config_update (infos_[k].config_key, - (item->active)? DETACH_YES_ : DETACH_NO_); + mixgtk_config_update (infos_[k].config_key, active? DETACH_YES_ : DETACH_NO_); } void @@ -216,8 +222,8 @@ void on_show_toolbars_toggled (GtkCheckMenuItem *item) { - if (item->active != mixgtk_config_show_toolbars ()) - show_toolbars_ (item->active); + gboolean active = gtk_check_menu_item_get_active (item); + if (active != mixgtk_config_show_toolbars ()) show_toolbars_ (active); } void @@ -252,8 +258,7 @@ infos_[k].menu = GTK_CHECK_MENU_ITEM - (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, - infos_[k].menu_name)); + (mixgtk_widget_factory_get_by_name (infos_[k].menu_name)); g_assert (infos_[k].menu != NULL); txt = mixgtk_config_get (infos_[k].config_key); infos_[k].detached = txt && !g_ascii_strcasecmp (txt, DETACH_YES_); @@ -309,8 +314,7 @@ G_OBJECT (mixgtk_widget_factory_get_dialog (infos_[k].dialog)); GObject *button = - G_OBJECT (mixgtk_widget_factory_get (infos_[k].dialog, - MIXGTK_WIDGET_ATTACH_BUTTON)); + G_OBJECT (mixgtk_widget_factory_get_by_name (infos_[k].attach_button)); g_assert (dialog != NULL); g_assert (button != NULL); @@ -426,7 +430,7 @@ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (page), devs); + gtk_container_add (GTK_CONTAINER (page), devs); infos_[MIXGTK_DEVICES_WINDOW].widget = page; @@ -450,8 +454,7 @@ gint style = mixgtk_config_tb_style (); tb_menu_ = GTK_CHECK_MENU_ITEM - (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, - TB_MENU_NAME_)); + (mixgtk_widget_factory_get_by_name (TB_MENU_NAME_)); g_assert (tb_menu_ != NULL); gtk_check_menu_item_set_active (tb_menu_, mixgtk_config_show_toolbars ()); @@ -475,8 +478,7 @@ for (k = 0; k < 4; ++k) { - GtkWidget *item = - mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, names[k]); + GtkWidget *item = mixgtk_widget_factory_get_by_name (names[k]); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (on_tb_style_), GUINT_TO_POINTER (k)); @@ -493,22 +495,21 @@ mixgtk_config_set_tb_style (ui_style); } +static const gchar *TB_NAME = "main_toolbar"; + static void set_tb_style_ (guint style) { - static const gchar *TB_NAME = "main_toolbar"; - static const gchar *TB_DNAME = "dlg_toolbar"; - gint k; - GtkToolbar *tb = GTK_TOOLBAR - (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, TB_NAME)); + GtkToolbar *tb = + GTK_TOOLBAR (mixgtk_widget_factory_get_by_name (TB_NAME)); gtk_toolbar_set_style (tb, style); for (k = 0; k < INF_NO_; ++k) { GtkToolbar *tb = GTK_TOOLBAR - (mixgtk_widget_factory_get_child_by_name (infos_[k].dialog, TB_DNAME)); + (mixgtk_widget_factory_get_by_name (infos_[k].toolbar_name)); gtk_toolbar_set_style (tb, style); } } @@ -516,12 +517,9 @@ static void show_toolbars_ (gboolean show) { - static const gchar *HANDLE_NAME = "tb_handle"; - gint k; - GtkWidget *handle = - mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, HANDLE_NAME); + GtkWidget *handle = mixgtk_widget_factory_get_by_name (TB_NAME); if (show) gtk_widget_show (handle); @@ -531,7 +529,7 @@ for (k = 0; k < INF_NO_; ++k) { GtkWidget *hd = - mixgtk_widget_factory_get_child_by_name (infos_[k].dialog, HANDLE_NAME); + mixgtk_widget_factory_get_by_name (infos_[k].toolbar_name); if (show) gtk_widget_show (hd); else gtk_widget_hide (hd); } @@ -544,7 +542,7 @@ #define AUTOSAVE_ITEM_ "save_on_exit" GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM - (mixgtk_widget_factory_get_child_by_name (MIXGTK_MAIN, AUTOSAVE_ITEM_)); + (mixgtk_widget_factory_get_by_name (AUTOSAVE_ITEM_)); if (item) { gtk_check_menu_item_set_active (item, mixgtk_config_is_autosave ()); @@ -559,8 +557,7 @@ GtkWidget *label; about_ = mixgtk_widget_factory_get_dialog (MIXGTK_ABOUT_DIALOG); g_assert (about_ != NULL); - label = mixgtk_widget_factory_get_child_by_name (MIXGTK_ABOUT_DIALOG, - VERSION_LABEL_); + label = mixgtk_widget_factory_get_by_name (VERSION_LABEL_); g_assert (label != NULL); gtk_label_set_text (GTK_LABEL (label), VERSION); gtk_widget_show (label); @@ -574,10 +571,16 @@ } static void +reparent_ (GtkWidget *widget, GtkWidget *parent) +{ + gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget); + gtk_container_add (GTK_CONTAINER (parent), widget); +} + +static void mixvm_detach_ (void) { - gtk_widget_reparent (infos_[MIXGTK_MIXVM_WINDOW].widget, - GTK_WIDGET (mixvm_container_)); + reparent_ (infos_[MIXGTK_MIXVM_WINDOW].widget, GTK_WIDGET (mixvm_container_)); } static void @@ -616,8 +619,7 @@ } mixgtk_mixal_reparent (stat); - gtk_widget_reparent (infos_[MIXGTK_MIXAL_WINDOW].widget, - GTK_WIDGET (mixal_container_)); + reparent_ (infos_[MIXGTK_MIXAL_WINDOW].widget, GTK_WIDGET (mixal_container_)); } static void @@ -630,10 +632,10 @@ static void dev_detach_ (void) { - gtk_widget_reparent (infos_[MIXGTK_DEVICES_WINDOW].widget, - GTK_WIDGET (dev_container_)); + reparent_ (infos_[MIXGTK_DEVICES_WINDOW].widget, GTK_WIDGET (dev_container_)); } + static void on_nb_switch_ (GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data) @@ -664,6 +666,3 @@ gtk_tool_item_set_visible_horizontal (detach_button_, wants_detach); gtk_tool_item_set_visible_vertical (detach_button_, wants_detach); } - - - diff -Nru mdk-1.2.11+dfsg/mixlib/mix.c mdk-1.3.0+dfsg/mixlib/mix.c --- mdk-1.2.11+dfsg/mixlib/mix.c 2015-11-16 22:32:29.000000000 +0000 +++ mdk-1.3.0+dfsg/mixlib/mix.c 2020-10-19 03:24:36.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mix.c : * Implementation of the functions declared in mix.h * ------------------------------------------------------------------ - * Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2014 Free Software Foundation, Inc. + * Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2014, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ } const char *MIX_GPL_LICENSE = -"Copyright (C) 2000-2014 Free Software Foundation, Inc.\n" +"Copyright (C) 2000-2020 Free Software Foundation, Inc.\n" "There is NO warranty. You may redistribute this software\n" "under the terms of the GNU General Public License.\n" "For more information about these matters, see the files named COPYING.\n"; diff -Nru mdk-1.2.11+dfsg/mixlib/xmix_vm.c mdk-1.3.0+dfsg/mixlib/xmix_vm.c --- mdk-1.2.11+dfsg/mixlib/xmix_vm.c 2019-04-09 01:37:34.000000000 +0000 +++ mdk-1.3.0+dfsg/mixlib/xmix_vm.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* ---------------------- xmix_vm.c : * Implementation of the functions declared in xmix_vm.h * ------------------------------------------------------------------ - * Copyright (C) 2000, 2003, 2004, 2007, 2010, 2013, 2019 Free Software Foundation, Inc. + * Copyright (C) 2000, 2003, 2004, 2007, 2010, 2013, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,14 +24,14 @@ #include "xmix_vm.h" /* auxiliar functions */ -G_INLINE_FUNC mix_address_t +static inline mix_address_t get_M_ (const mix_vm_t *vm, const mix_ins_t *ins); -G_INLINE_FUNC mix_word_t +static inline mix_word_t get_V_ (const mix_vm_t *vm, const mix_ins_t *ins); -G_INLINE_FUNC mix_device_t * +static inline mix_device_t * get_dev_ (mix_vm_t *vm, mix_fspec_t type); -G_INLINE_FUNC mix_address_t +static inline mix_address_t get_M_ (const mix_vm_t *vm, const mix_ins_t *ins) { if ( ins->index == 0 ) @@ -41,13 +41,13 @@ mix_word_to_short_fast (get_rI_ (vm, ins->index))); } -G_INLINE_FUNC mix_word_t +static inline mix_word_t get_V_ (const mix_vm_t *vm, const mix_ins_t *ins) { return mix_word_get_field (ins->fspec, get_cell_ (vm, get_M_ (vm,ins))); } -G_INLINE_FUNC mix_device_t * +static inline mix_device_t * get_dev_ (mix_vm_t *vm, mix_fspec_t type) { if (type >= BD_NO_) return NULL; diff -Nru mdk-1.2.11+dfsg/mixlib/xmix_vm_handlers.c mdk-1.3.0+dfsg/mixlib/xmix_vm_handlers.c --- mdk-1.2.11+dfsg/mixlib/xmix_vm_handlers.c 2019-04-09 01:50:31.000000000 +0000 +++ mdk-1.3.0+dfsg/mixlib/xmix_vm_handlers.c 2020-10-19 03:06:00.000000000 +0000 @@ -1,7 +1,7 @@ /* -*-c-*- -------------- xmix_vm_handlers.c : * Implementation of the functions declared in xmix_vm_handlers.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010, 2014 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010, 2014, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -314,7 +314,7 @@ if (gerr && gerr->message) log_error_ (dis, gerr->message); } - if (gerr) g_free (gerr); + if (gerr) g_error_free (gerr); if (output) g_free (output); if (errors) g_free (errors); diff -Nru mdk-1.2.11+dfsg/NEWS mdk-1.3.0+dfsg/NEWS --- mdk-1.2.11+dfsg/NEWS 2020-10-15 19:48:45.000000000 +0000 +++ mdk-1.3.0+dfsg/NEWS 2020-10-31 04:17:16.000000000 +0000 @@ -8,16 +8,22 @@ Please send mdk bug reports to bug-mdk@gnu.org. --------------------------------------------------------------------------- +* Version 1.3.0 (31/10/20) + + - Graphical user interface upgraded to GTK+ 3.14+ + +--------------------------------------------------------------------------- * Version 1.2.11 (15/10/20) ** Bug fixes: - #55877: mixvm.el: obsolete string-to-int removed. - Read/write access to/from highest word of memory (patch #9773 by - Kevin Brunnelle). + Kevin Brunelle). - Correctly rewind tape when seeking past beginning of file (patch #9974 by Kevin Brunelle). - Memory usage optimizations (Kevin Brunelle). + - Compatibility with Guile 3. --------------------------------------------------------------------------- * Version 1.2.10 (07/01/19) @@ -576,7 +582,7 @@ * Copying information: Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, - 2010, 2013, 2014, 2015 Free Software Foundation, Inc. + 2010, 2013, 2014, 2015, 2019, 2020 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the