From a4634ed7779f0905e3bfeb781e58d40a5bdf9bb7 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 4 Jan 2021 17:20:55 -0500
Subject: Import ACPICA 20201217.

---
 source/components/parser/psloop.c  | 3 +--
 source/components/parser/psparse.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'source/components/parser')

diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c
index 5b4b0d989bdd..6ccac91012b5 100644
--- a/source/components/parser/psloop.c
+++ b/source/components/parser/psloop.c
@@ -410,8 +410,7 @@ AcpiPsParseLoop (
                  */
                 WalkState->Op = NULL;
                 Status = AcpiDsGetPredicateValue (WalkState, ACPI_TO_POINTER (TRUE));
-                if (ACPI_FAILURE (Status) &&
-                    ((Status & AE_CODE_MASK) != AE_CODE_CONTROL))
+                if (ACPI_FAILURE (Status) && !ACPI_CNTL_EXCEPTION (Status))
                 {
                     if (Status == AE_AML_NO_RETURN_VALUE)
                     {
diff --git a/source/components/parser/psparse.c b/source/components/parser/psparse.c
index d935ebc2df76..16458bc3e9d5 100644
--- a/source/components/parser/psparse.c
+++ b/source/components/parser/psparse.c
@@ -533,7 +533,7 @@ AcpiPsNextParseState (
     default:
 
         Status = CallbackStatus;
-        if ((CallbackStatus & AE_CODE_MASK) == AE_CODE_CONTROL)
+        if (ACPI_CNTL_EXCEPTION (CallbackStatus))
         {
             Status = AE_OK;
         }
-- 
cgit v1.3