X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.c;h=781a81bda516c5e5fdbf7f0f06351a8a3e63f69e;hp=b20542bbd172c554aa375c1bbb513724112ea3fe;hb=HEAD;hpb=7d748dc6e2259984c9093c48d84ae1ed280632ad

diff --git a/sect.c b/sect.c
index b20542b..12f9c89 100644
--- a/sect.c
+++ b/sect.c
@@ -462,6 +462,15 @@ int ResolveFixups(int sno)
 			if (evexpr(fup->expr, &eval, &eattr, &esym) != OK)
 				continue;
 
+			if (esym)
+				if (!(esym->sattr & DEFINED) && eval==0)
+				{
+					// If our expression still has an undefined symbol at this stage, it's bad news.
+					// The linker is never going to resolve the expression, so that's an error.
+					error("cannot export complex expression with unresloved symbol '%s'", esym->sname);
+					continue;
+				}
+
 			if ((CHECK_OPTS(OPT_PC_RELATIVE)) && (eattr & (DEFINED | REFERENCED | EQUATED)) == (DEFINED | REFERENCED))
 			{
 				error("relocation not allowed when o30 is enabled");
@@ -548,6 +557,9 @@ int ResolveFixups(int sno)
 						// In this instruction the PC is located a DWORD away
 						if (dw & FU_PCRELX)
 							eval += 2;
+						
+						if ((int64_t)eval > 0x7fff || (int64_t)eval < -32768)
+							error(range_error);
 					}
 					else
 					{