Skip to content

Commit

Permalink
Fixed a bug in output.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
Ziang95 committed Nov 16, 2019
1 parent 4091f8c commit 3480d49
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
2 changes: 1 addition & 1 deletion output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void* output_automat(void *args)
cout<<setw(3)<<"R"+to_string(2*i)<<"="<<m.i<<(m.i>9999?"\t":"\t\t");
if (2*i + 1 < REG_NUM)
{
reg->get("R"+to_string(2*i), m);
reg->get("R"+to_string(2*i+1), m);
cout<<setw(3)<<"R"+to_string(i*2+1)<<"="<<m.i<<(m.i>9999?"\t":"\t\t");
}
reg->get("F"+to_string(2*i), m);
Expand Down
2 changes: 1 addition & 1 deletion reserv_station.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class resStation
bool Rj; //Indicates whether operand j is ready
bool Rk; //Indicates whether operand k is ready
bool sub; //If this is a subtraction instr, Vk will be additive inversed
public:
public:
opCode code; //Operation code
const valType type; //Operand type, integer or float point. (not very useful, may remove it in future)
pthread_t handle; //The handle of thread running reserv_automat()
Expand Down
12 changes: 0 additions & 12 deletions test.txt

This file was deleted.

0 comments on commit 3480d49

Please sign in to comment.