summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/compiler/aslcompile.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2015-04-11 03:23:41 +0000
committerjkim <jkim@FreeBSD.org>2015-04-11 03:23:41 +0000
commit94f110f31347dc79883dc4c041bb750c9f07e7d2 (patch)
tree4624054659df9227c59dda7a6d689446bc231b4b /sys/contrib/dev/acpica/compiler/aslcompile.c
parent4cd5f1d88e1d9580b0e7263cd8c3470067b43aa0 (diff)
downloadFreeBSD-src-94f110f31347dc79883dc4c041bb750c9f07e7d2.zip
FreeBSD-src-94f110f31347dc79883dc4c041bb750c9f07e7d2.tar.gz
Merge ACPICA 20150410.
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/aslcompile.c')
-rw-r--r--sys/contrib/dev/acpica/compiler/aslcompile.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslcompile.c b/sys/contrib/dev/acpica/compiler/aslcompile.c
index cf37c6a..0b0ca7a 100644
--- a/sys/contrib/dev/acpica/compiler/aslcompile.c
+++ b/sys/contrib/dev/acpica/compiler/aslcompile.c
@@ -195,8 +195,16 @@ CmDoCompile (
Event = UtBeginEvent ("Constant folding via AML interpreter");
DbgPrint (ASL_DEBUG_OUTPUT,
"\nInterpreting compile-time constant expressions\n\n");
- TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
- OpcAmlConstantWalk, NULL, NULL);
+
+ if (Gbl_FoldConstants)
+ {
+ TrWalkParseTree (RootNode, ASL_WALK_VISIT_DOWNWARD,
+ OpcAmlConstantWalk, NULL, NULL);
+ }
+ else
+ {
+ DbgPrint (ASL_PARSE_OUTPUT, " Optional folding disabled\n");
+ }
UtEndEvent (Event);
/* Update AML opcodes if necessary, after constant folding */
OpenPOWER on IntegriCloud