From: David Given <dg@cowlark.com>
Date: Sat, 1 Oct 2016 21:13:39 +0000 (+0200)
Subject: Deal with malformed mes instructions emitted by ego.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=3474e202748fd84b7a168fcf633077dc6c6e17d0;p=ack.git

Deal with malformed mes instructions emitted by ego.
---

diff --git a/mach/proto/mcg/parse_em.c b/mach/proto/mcg/parse_em.c
index 7c0015184..4508d594c 100644
--- a/mach/proto/mcg/parse_em.c
+++ b/mach/proto/mcg/parse_em.c
@@ -328,11 +328,18 @@ static void parse_mes(void)
 
         case 3: /* register variable */
         {
-            arith offset = mes_get_cst();
-            int size = mes_get_cst();
-            int type = mes_get_cst();
-            int priority = mes_get_cst();
-            tb_regvar(offset, size, type, priority);
+            /* ego will sometimes generate 'mes 3' pseudos with no actual
+             * parameters. Detect and ignore these. */
+            
+            EM_getinstr(&em);
+            if (em.em_type == EM_MESARG)
+            {
+                arith offset = em.em_cst;
+                int size = mes_get_cst();
+                int type = mes_get_cst();
+                int priority = mes_get_cst();
+                tb_regvar(offset, size, type, priority);
+            }
             break;
         }
     }