summaryrefslogtreecommitdiffhomepage
path: root/mixlib
diff options
context:
space:
mode:
Diffstat (limited to 'mixlib')
-rw-r--r--mixlib/mix_ins.c4
-rw-r--r--mixlib/mix_ins.h4
2 files changed, 4 insertions, 4 deletions
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 { \