wu-arch/kernels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed predicate register encoding #2

Browse Source
This commit is contained in:
chad
2014-10-08 15:05:45 -04:00
parent 72f5c06a3f
commit 1f34e759bc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/enc.cpp
View File

@@ -8,8 +8,7 @@
#include <iomanip> #include <iomanip>
#include <vector> #include <vector>
#include "include/debug.h"
#include "include/types.h" #include "include/types.h"
#include "include/util.h" #include "include/util.h"
#include "include/enc.h" #include "include/enc.h"
@@ -271,8 +270,8 @@ Instruction *WordDecoder::decode(const std::vector<Byte> &v, Size &idx) {
Word code(readWord(v, idx, n/8)); Word code(readWord(v, idx, n/8));
Instruction &inst = * new Instruction(); Instruction &inst = * new Instruction();
bool predicated = (code>>(i1+o+p)); bool predicated = (code>>(n-1));
if (predicated) { inst.setPred((code>>(i1+o))&p); } if (predicated) { inst.setPred((code>>(n-p-1))&pMask); }
Instruction::Opcode op = (Instruction::Opcode)((code>>i1)&oMask); Instruction::Opcode op = (Instruction::Opcode)((code>>i1)&oMask);
inst.setOpcode(op); inst.setOpcode(op);
@@ -346,7 +345,7 @@ Instruction *WordDecoder::decode(const std::vector<Byte> &v, Size &idx) {
inst.setImmRef(*r); inst.setImmRef(*r);
} }
//cout << "Decoded 0x" << hex << code << " into: " << inst << '\n'; D(2, "Decoded 0x" << hex << code << " into: " << inst << '\n');
return &inst; return &inst;
} }