summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/compiler/dtexpress.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2012-03-20 21:37:52 +0000
committerjkim <jkim@FreeBSD.org>2012-03-20 21:37:52 +0000
commit9807567995352b475fd7e23ea58b7512a20e7bd3 (patch)
tree2a460dab9bb8e6fffc77dcd3749cddbe16ec0ab6 /sys/contrib/dev/acpica/compiler/dtexpress.c
parent107d21a0f4a0fa5f29290cca23e94c24fe945998 (diff)
parentf65c4f80d1c60e597f67836e51986ebf3cd669f7 (diff)
downloadFreeBSD-src-9807567995352b475fd7e23ea58b7512a20e7bd3.zip
FreeBSD-src-9807567995352b475fd7e23ea58b7512a20e7bd3.tar.gz
Merge ACPICA 20120320.
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/dtexpress.c')
-rw-r--r--sys/contrib/dev/acpica/compiler/dtexpress.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/contrib/dev/acpica/compiler/dtexpress.c b/sys/contrib/dev/acpica/compiler/dtexpress.c
index a5565ab..f0a1c8e 100644
--- a/sys/contrib/dev/acpica/compiler/dtexpress.c
+++ b/sys/contrib/dev/acpica/compiler/dtexpress.c
@@ -142,7 +142,7 @@ DtDoOperator (
if (!RightValue)
{
DtError (ASL_ERROR, ASL_MSG_DIVIDE_BY_ZERO,
- Gbl_CurrentField, Gbl_CurrentField->Value);
+ Gbl_CurrentField, NULL);
return (0);
}
Result = LeftValue / RightValue;
@@ -152,7 +152,7 @@ DtDoOperator (
if (!RightValue)
{
DtError (ASL_ERROR, ASL_MSG_DIVIDE_BY_ZERO,
- Gbl_CurrentField, Gbl_CurrentField->Value);
+ Gbl_CurrentField, NULL);
return (0);
}
Result = LeftValue % RightValue;
@@ -191,7 +191,7 @@ DtDoOperator (
break;
case EXPOP_EQUAL:
- Result = LeftValue = RightValue;
+ Result = LeftValue == RightValue;
break;
case EXPOP_NOT_EQUAL:
@@ -223,13 +223,12 @@ DtDoOperator (
/* Unknown operator */
DtFatal (ASL_MSG_INVALID_EXPRESSION,
- Gbl_CurrentField, Gbl_CurrentField->Value);
+ Gbl_CurrentField, NULL);
return (0);
}
DbgPrint (ASL_DEBUG_OUTPUT,
- "IntegerEval: %s (%8.8X%8.8X %s %8.8X%8.8X) = %8.8X%8.8X\n",
- Gbl_CurrentField->Value,
+ "IntegerEval: (%8.8X%8.8X %s %8.8X%8.8X) = %8.8X%8.8X\n",
ACPI_FORMAT_UINT64 (LeftValue),
DtGetOpName (Operator),
ACPI_FORMAT_UINT64 (RightValue),
OpenPOWER on IntegriCloud