summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-10-10 01:52:40 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-10-10 01:52:40 +0200
commit1f16fa91d1a04b159be8c6afd39d06a52500c92a (patch)
treefa8cfb60eeda3c1c1c295a2b0cb764a5e9d7fb6b
parentd9e42ac54b5354dfa035937f1cf7f3b0d054068f (diff)
downloadmdk-1.2.6.tar.gz
mdk-1.2.6.tar.bz2
Fix for #56521.2.6
-rw-r--r--NEWS7
-rw-r--r--mixlib/mix_ins.c4
-rw-r--r--mixlib/mix_ins.h4
3 files changed, 8 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index def62de..1f6ffde 100644
--- a/NEWS
+++ b/NEWS
@@ -6,17 +6,18 @@ See the end for copying conditions.
Please send mdk bug reports to bug-mdk@gnu.org.
---------------------------------------------------------------------------
-* Version 1.2.6 ():
+* Version 1.2.6 (10/10/10):
** Bug fixes:
- mixvm: the instruction MOVE with F=0 is interpreted correctly as
a NOP (#31010).
+ - mixasm: no longer limit the index field to 3 bits (#5652)
- debugger: breakpoints for I register modification fixed.
- Manual: download info updated to point to Git repositories
(#29524).
- - Compilation without Guile works again (#28086)
- - Parallel compilation with `make -jn' now works (#31018)
+ - Compilation without Guile works again (#28086).
+ - Parallel compilation with `make -jn' now works (#31018).
---------------------------------------------------------------------------
* Version 1.2.5 (11/10/09):
diff --git a/mixlib/mix_ins.c b/mixlib/mix_ins.c
index 871a7f7..663591d 100644
--- a/mixlib/mix_ins.c
+++ b/mixlib/mix_ins.c
@@ -1,7 +1,7 @@
/* -*-c-*- ------------------ mix_ins.c :
* Implementation of the functions declared in mix_ins.h
* ------------------------------------------------------------------
- * Copyright (C) 1999, 2003, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2003, 2007, 2010 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
@@ -139,7 +139,7 @@ mix_ins_to_word (const mix_ins_t *ins)
{
g_return_val_if_fail (ins != NULL, MIX_WORD_ZERO);
return (mix_word_t)((ins->address<<18)|
- ((ins->index&7)<<12)|(ins->fspec<<6)|(ins->opcode));
+ ((ins->index)<<12)|(ins->fspec<<6)|(ins->opcode));
}
mix_ins_id_t
diff --git a/mixlib/mix_ins.h b/mixlib/mix_ins.h
index 7a4d028..1ea3f81 100644
--- a/mixlib/mix_ins.h
+++ b/mixlib/mix_ins.h
@@ -2,7 +2,7 @@
* This file declares types and functions for manipulating MIX
* instructions
* ------------------------------------------------------------------
- * Copyright (C) 2000, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2006, 2007, 2010 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
@@ -155,7 +155,7 @@ mix_word_to_ins(mix_word_t w, mix_ins_t *ins);
/* unchecked versions for speed */
#define mix_ins_to_word_uncheck(ins) \
(mix_word_t)(((ins).address<<18)| \
- (((ins).index&7)<<12)|((ins).fspec<<6)|((ins).opcode))
+ (((ins).index)<<12)|((ins).fspec<<6)|((ins).opcode))
#define mix_word_to_ins_uncheck(word,ins) \
do { \