From 60780a514aa12b5ab599f58f4e2b6912203332f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Henrik=20Sk=C3=A5rstedt?= <cskarstedt@gmail.com>
Date: Thu, 28 Jan 2016 21:06:41 -0800
Subject: [PATCH] Pool labels of even 16ths would be re-reserved due to a
 left-right bug

- Shifted left when I should have shifted right.
---
 x65.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x65.cpp b/x65.cpp
index 79bfdab..3125ffc 100644
--- a/x65.cpp
+++ b/x65.cpp
@@ -3982,6 +3982,7 @@ StatusCode Asm::AssignPoolLabel(LabelPool &pool, strref label)
 	pLabel->reference = false;
 
 	MarkLabelLocal(label, true);
+	LabelAdded(pLabel, !!pool.scopeDepth);
 	return error;
 }
 
@@ -4014,7 +4015,7 @@ StatusCode LabelPool::Reserve(int numBytes, unsigned int &ret_addr)
 			for (int b = 0; b<numBytes; b++) {
 				*addr_map |= m;
 				unsigned int _m = m << 2;
-				if (!_m) { m <<= 30; addr_map++; } else { m = _m; }
+				if (!_m) { m >>= 30; addr_map++; } else { m = _m; }
 			}
 			ret_addr = addr;
 			return STATUS_OK;