Merge pull request #1062 from TomHarte/6502BRK

Correct 6502 for switched BRK presumption.

Processors/6502/Implementation/6502Implementation.hpp

@@ -171,8 +171,8 @@ template <Personality personality, typename T, bool uses_ready_line> void Proces
 					case CyclePullY:					s_++; read_mem(y_, s_ | 0x100);						break;
 					case CyclePullOperand:				s_++; read_mem(operand_, s_ | 0x100);				break;
 					case OperationSetFlagsFromOperand:	set_flags(operand_);								continue;
-					case OperationSetOperandFromFlagsWithBRKSet: operand_ = flags_.get() | Flag::Break;		continue;
+					case OperationSetOperandFromFlagsWithBRKSet: operand_ = flags_.get();					continue;
-					case OperationSetOperandFromFlags:  operand_ = flags_.get();							continue;
+					case OperationSetOperandFromFlags:  operand_ = flags_.get() & ~Flag::Break;				continue;
 					case OperationSetFlagsFromA:		flags_.set_nz(a_);									continue;
 					case OperationSetFlagsFromX:		flags_.set_nz(x_);									continue;
 					case OperationSetFlagsFromY:		flags_.set_nz(y_);									continue;

Storage/Disk/DiskImage/Formats/IPF.cpp

@@ -25,7 +25,7 @@ constexpr uint32_t block(const char (& src)[5]) {
 	);
 }
 
-constexpr size_t block_size(Storage::FileHolder &file, uint8_t header) {
+size_t block_size(Storage::FileHolder &file, uint8_t header) {
 	uint8_t size_width = header >> 5;
 	size_t length = 0;
 	while(size_width--) {