From 69ccd19a7b36bedd79dfbca80bd6939dfa74233d Mon Sep 17 00:00:00 2001
From: daidai_is_here <daiqianwen@huawei.com>
Date: Thu, 9 Jan 2020 15:51:07 +0800
Subject: [PATCH] delete files

---
 OPT_LDFLAGS.patch          |   26 -
 acpibin.1                  |   64 -
 acpica-tools.spec          |   64 +-
 acpidump.1                 |  106 -
 acpiexamples.1             |   49 -
 acpiexec.1                 |  102 -
 acpihelp.1                 |   80 -
 acpinames.1                |   49 -
 acpisrc.1                  |   72 -
 acpixtract.1               |   60 -
 arm7hl.patch               |   20 -
 aslcodegen.patch           |   29 -
 badcode.asl.result         |  266 --
 big-endian-v2.patch        |   18 -
 big-endian.patch           | 6643 ------------------------------------
 converterSample.asl.result |   24 -
 f23-harden.patch           |   61 -
 facp.patch                 |   31 -
 grammar.asl.result         |  381 ---
 iasl.1                     |  231 --
 int-format.patch           |  283 --
 mips-be-fix.patch          |   37 -
 ppc64le.patch              |   16 -
 ptr-cast.patch             |   48 -
 run-misc-tests.sh          |   47 -
 simple-64bit.patch         |   20 -
 str-trunc-warn.patch       |  112 -
 template.patch             |   22 -
 unaligned.patch            |  105 -
 29 files changed, 5 insertions(+), 9061 deletions(-)
 delete mode 100644 OPT_LDFLAGS.patch
 delete mode 100644 acpibin.1
 delete mode 100644 acpidump.1
 delete mode 100644 acpiexamples.1
 delete mode 100644 acpiexec.1
 delete mode 100644 acpihelp.1
 delete mode 100644 acpinames.1
 delete mode 100644 acpisrc.1
 delete mode 100644 acpixtract.1
 delete mode 100644 arm7hl.patch
 delete mode 100644 aslcodegen.patch
 delete mode 100644 badcode.asl.result
 delete mode 100644 big-endian-v2.patch
 delete mode 100644 big-endian.patch
 delete mode 100644 converterSample.asl.result
 delete mode 100644 f23-harden.patch
 delete mode 100644 facp.patch
 delete mode 100644 grammar.asl.result
 delete mode 100644 iasl.1
 delete mode 100644 int-format.patch
 delete mode 100644 mips-be-fix.patch
 delete mode 100644 ppc64le.patch
 delete mode 100644 ptr-cast.patch
 delete mode 100644 run-misc-tests.sh
 delete mode 100644 simple-64bit.patch
 delete mode 100644 str-trunc-warn.patch
 delete mode 100644 template.patch
 delete mode 100644 unaligned.patch

diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
deleted file mode 100644
index a1ca276..0000000
--- a/OPT_LDFLAGS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: acpica-unix2-20170728/generate/unix/Makefile.config
-===================================================================
---- acpica-unix2-20170728.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20170728/generate/unix/Makefile.config
-@@ -23,6 +23,9 @@
- # OPT_CFLAGS can be overridden on the make command line by
- #   adding OPT_CFLAGS="..." to the invocation.
- #
-+# OPT_LDFLAGS can be overridden on the make command line by
-+#   adding OPT_LDFLAGS="..." to the invocation.
-+#
- # Notes:
- #   gcc should be version 4 or greater, otherwise some of the options
- #     used will not be recognized.
-@@ -157,6 +160,11 @@ LDFLAGS +=-m32
- endif
- 
- #
-+# Common linker flags
-+#
-+OPT_LDFLAGS ?= 
-+
-+#
- # Optionally disable optimizations. Optimization causes problems on
- # some compilers such as gcc 4.4
- #
diff --git a/acpibin.1 b/acpibin.1
deleted file mode 100644
index b8448a5..0000000
--- a/acpibin.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPIBIN 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpibin \- ACPI binary AML file utility
-.SH SYNOPSIS
-.B acpibin
-.RI [ <option> ... ]
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpibin
-command. The option list is taken from the acpibin interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpibin
-is a command provided to perform some basic and common operations on
-AML binary files.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-.TP
-.B \-c <file1> <file2>
-Compare two binary AML files
-.TP
-.B \-d <in> <out>
-Dump AML binary to text file
-.TP
-.B \-e <sig> <in> <out>
-Extract binary AML table from acpidump file
-.TP
-.B \-h <file>
-Display table header for binary AML file
-.TP
-.B \-s <file>
-Update checksum for binary AML file
-.TP
-.B \-t
-Terse mode
-
-.SH AUTHOR
-acpibin was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 3a50097..69f5cc4 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -8,39 +8,11 @@ URL:            https://www.acpica.org/
 
 Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
 Source1:        https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
-Source2:        iasl.1
-Source3:        acpibin.1
-Source4:        acpidump.1
-Source5:        acpiexec.1
-Source6:        acpihelp.1
-Source7:        acpinames.1
-Source8:        acpisrc.1
-Source9:        acpixtract.1
-Source10:       acpiexamples.1
-Source11:       badcode.asl.result
-Source12:       grammar.asl.result
-Source13:       converterSample.asl.result
-Source14:       run-misc-tests.sh
-Source15:       COPYING
+Source2:        COPYING
 
-Patch0001:      big-endian.patch
-Patch0002:      unaligned.patch
-Patch0003:      OPT_LDFLAGS.patch
-Patch0004:      int-format.patch
-Patch0005:      f23-harden.patch
-Patch0006:      template.patch
-Patch0007:      ppc64le.patch
-Patch0008:      arm7hl.patch
-Patch0009:      big-endian-v2.patch
-Patch0010:      simple-64bit.patch
-Patch0011:      mips-be-fix.patch
-Patch0012:      cve-2017-13693.patch
-Patch0013:      cve-2017-13694.patch
-Patch0014:      cve-2017-13695.patch
-Patch0015:      str-trunc-warn.patch
-Patch0016:      ptr-cast.patch
-Patch0017:      aslcodegen.patch
-Patch0018:      facp.patch
+Patch0001:      cve-2017-13693.patch
+Patch0002:      cve-2017-13694.patch
+Patch0003:      cve-2017-13695.patch
 
 BuildRequires:  bison patchutils flex gcc
 Provides:       acpixtract >= 20120913-7 iasl = %{version}-%{release} acpidump >= 20100513-5
@@ -59,32 +31,12 @@ operating system software. The primary purpose of the ACPI Component Architectur
 ACPI implementations for operating system vendors (OSVs) by providing major portions of an ACPI
 implementation in OS-independent ACPI modules that can be easily integrated into any OS.
 
-%package help
-Summary:        Help documantation of acpica-tools package
-
-%description help
-Help documantation of acpica-tools package.
-
 %prep
 %autosetup -n acpica-unix2-%{version} -p1
 gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 
-install -p %{SOURCE2} iasl.1
-install -p %{SOURCE3} acpibin.1
-install -p %{SOURCE4} acpidump.1
-install -p %{SOURCE5} acpiexec.1
-install -p %{SOURCE6} acpihelp.1
-install -p %{SOURCE7} acpinames.1
-install -p %{SOURCE8} acpisrc.1
-install -p %{SOURCE9} acpixtract.1
-install -p %{SOURCE10} acpiexamples.1
-install -p %{SOURCE11} badcode.asl.result
-install -p %{SOURCE12} grammar.asl.result
-install -p %{SOURCE13} converterSample.asl.result
-install -p %{SOURCE14} tests/run-misc-tests.sh
-install -p %{SOURCE15} COPYING
+install -p %{SOURCE2} COPYING
 
-chmod a+x tests/run-misc-tests.sh
 chmod a-x changes.txt
 chmod a-x source/compiler/new_table.txt
 
@@ -107,9 +59,6 @@ export OPT_LDFLAGS="%{__global_ldflags}"
 install -d %{buildroot}%{_bindir}
 install -pD generate/unix/bin*/* %{buildroot}%{_bindir}/
 
-install -d %{buildroot}%{_mandir}/man1
-install -pDm 0644 *.1 %{buildroot}%{_mandir}/man1/
-
 install -d %{buildroot}%{_docdir}/acpica-tools/examples
 install -pDm 0644 source/tools/examples/* %{buildroot}%{_docdir}/acpica-tools/examples/
 
@@ -149,9 +98,6 @@ fi
 %files
 %doc changes.txt source/compiler/new_table.txt COPYING
 %{_bindir}/*
-
-%files help
-%{_mandir}/*
 %{_docdir}/*
 
 %changelog
diff --git a/acpidump.1 b/acpidump.1
deleted file mode 100644
index a3ab061..0000000
--- a/acpidump.1
+++ /dev/null
@@ -1,106 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPIDUMP 1 "July 24, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpidump \- ACPI table dump utility
-.SH SYNOPSIS
-.B acpidump
-.RI [ <option> ... ]
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpidump
-command.  The option list is taken from the interactive help.
-.PP
-The
-.B acpidump
-command extracts the ACPI tables currently in use from the running
-kernel in a form usable for later processing by the
-.B acpixtract
-command.
-.PP
-Invocation of
-.B acpidump
-without parameters will dump all available ACPI tables.  Multiple mixed
-instances of the
-.B \-a
-,
-.B \-f
-, and
-.B \-n
-parameters can be used.
-
-.SH OPTIONS
-.PP
-.TP
-.B \-b
-Dump tables in binary format (versus the default human-readable form)
-
-.PP
-.TP
-.B \-h | \-?
-Display this help message
-
-.PP
-.TP
-.B \-o <file>
-Redirect output to a file.  This file can be used later by
-.B acpixtract
-to examine the contents of the ACPI tables.
-
-.PP
-.TP
-.B \-s
-Print table summaries only.
-
-.PP
-.TP
-.B \-v
-Print the version of this utility.
-
-.PP
-.TP
-.B \-z
-Verbose mode.
-
-.PP
-.TP
-.B \-a <address>
-Get a table from a physical address (must be superuser and you must be
-careful which address you use -- dmesg will typically report the addresses
-for the various tables).
-
-.PP
-.TP
-.B \-f <binary-file>
-Get a table from a binary file (see the
-.B \-b
-option).
-
-.PP
-.TP
-.B \-n <signature>
-Get a table via it's name or signature (e.g., MADT or SSDT).
-
-.SH SEE ALSO
-.B acpixtract(1)
-
-.SH AUTHOR
-acpidump was written by Robert Moore <robert.moore@intel.com> and
-Chao Guan <chao.guan@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/acpiexamples.1 b/acpiexamples.1
deleted file mode 100644
index a48aad6..0000000
--- a/acpiexamples.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPIEXAMPLES 1 "August 8, 2018"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpiexamples \- program showing what the code examples actually do
-.SH SYNOPSIS
-.B acpiexamples
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpiexamples
-command. This command has no options available.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpiexamples
-prints out the results of various calls using the ACPICA source code,
-showing what happens when the calls are made.  These results are from
-building and running the code provided in the
-/usr/share/doc/acpica-tools/examples directory that illustrate the
-proper sequencing of calls and how to make them.
-.PP
-Much more detailed documentation about ACPICA may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-None
-
-.SH AUTHOR
-acpiexamples was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/acpiexec.1 b/acpiexec.1
deleted file mode 100644
index 4b77daa..0000000
--- a/acpiexec.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPIEXEC 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpiexec \- ACPI AML execution and debug utility
-.SH SYNOPSIS
-.B acpiexec
-.RI [ <option> ... ]
-.RI <aml-file>
-.B ...
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpiexec
-command. The option list is taken from the acpiexec interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpiexec
-provides a simulated execution environment for AML code so that it
-can be more easily tested and debugged.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-.TP
-.B \-?
-Display the help message
-.TP
-.B \-b "command-line"
-Batch mode command line execution (cmd1;cmd2;...)
-.TP
-.B \-M [<method>]
-Batch mode method execution (Default: MAIN)
-.TP
-.B \-da
-Disable method abort on error
-.TP
-.B \-di
-Disable execution of _STA/_INI methods during init
-.TP
-.B \-do
-Disable Operation Region address simulation
-.TP
-.B \-dr
-Disable repair of method return values
-.TP
-.B \-dt
-Disable allocation tracking (performance)
-.TP
-.B \-ef
-Enable display of final memory statistics
-.TP
-.B \-ei
-Enable additional tests for ACPICA interfaces
-.TP
-.B \-em
-Enable interpreter Serialized mode
-.TP
-.B \-es
-Enable interpreter Slack mode
-.TP
-.B \-et
-Enable debug semaphore timeour
-.TP
-.B \-f <value>
-Operation Region initialization fill value
-.TP
-.B \-r
-Use hardware-reduced FADT V5
-.TP
-.B \-vi
-Verbose initialization output
-.TP
-.B \-vr
-Verbose region handler output
-.TP
-.B \-x <debug-level>
-Debug output level
-
-.SH AUTHOR
-acpiexec was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/acpihelp.1 b/acpihelp.1
deleted file mode 100644
index fc61014..0000000
--- a/acpihelp.1
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPIHELP 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpihelp \- ACPI help utility
-.SH SYNOPSIS
-.B acpihelp
-.RI <option> ...
-.RI [<name-prefix>|<hex-value>]
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpihelp
-command. The option list is taken from the acpihelp interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpihelp
-provides descriptive text for AML and ASL keywords, methods, and opcodes.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-.PP
-If neither a <name-prefix> or a <hex-value> is provided,
-.B acpihelp
-will do the logical equivalent of a "display all."
-.PP
-A default search (that is, a search with no options) and a <name-prefix>
-can mean two different things: (1) if <name-prefix> does not start with
-an underscore, find ASL operator names, or (2) if <name-prefix> does start
-with an underscore, find ASL predefined method names.
-
-.SH OPTIONS
-
-.PP
-.SS ACPI Names and Symbols
-.TP
-.B \-k [<name-prefix>]
-Find/Display ASL non-operator keyword(s)
-.TP
-.B \-m [<name-prefix>]
-Find/Display AML opcode name(s)
-.TP
-.B \-p [<name-prefix>]
-Find/Display ASL predefined method name(s)
-.TP
-.B \-s [<name-prefix>]
-Find/Display ASL operator name(s)
-
-.PP
-.SS ACPI Values
-.TP
-.B \-e [<hex-value>]
-Decode ACPICA exception code
-.TP
-.B \-i
-Display known ACPI Device IDs (_HID)
-.TP
-.B \-i [<hex-value>]
-Decode hex AML opcode
-
-.SH AUTHOR
-acpihelp was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/acpinames.1 b/acpinames.1
deleted file mode 100644
index 315d235..0000000
--- a/acpinames.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPINAMES 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpinames \- ACPI name space dump utility
-.SH SYNOPSIS
-.B acpinames
-.RI <option> ...
-.RI <aml-file>
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpinames
-command. The option list is taken from the acpinames interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpinames
-prints out the complete ACPI name space for an AML file.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-.TP
-.B \-? [<name-prefix>]
-Display this help message
-
-.SH AUTHOR
-acpinames was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/acpisrc.1 b/acpisrc.1
deleted file mode 100644
index 37d8971..0000000
--- a/acpisrc.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPISRC 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpisrc \- ACPICA source code conversion utility
-.SH SYNOPSIS
-.B acpisrc
-.RI [ -c | -l | -u] [-d] [-s] [-v] [-y] <source-dir> <dest-dir>
-.RI <aml-file>
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpisrc
-command. The option list is taken from the acpisrc interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpisrc
-converts the ACPICA into various forms for use with different operating
-systems.
-Source for ACPICA may be obtained from http://www.acpica.org/source/.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-.TP
-.B \-c
-Generate cleaned version of the source
-.TP
-.B \-h
-Insert dual-license header into all module
-.TP
-.B \-l
-Generate Linux version of the source
-.TP
-.B \-u
-Generate custom source translation
-.TP
-.B \-d
-Leave debug statements in code
-.TP
-.B \-s
-Generate source statistics only
-.TP
-.B \-v
-Verbose mode
-.TP
-.B \-y
-Suppress file overwrite prompts
-
-.SH AUTHOR
-acpisrc was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/acpixtract.1 b/acpixtract.1
deleted file mode 100644
index 65239e9..0000000
--- a/acpixtract.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPIXTRACT 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpixtract \- ACPICA source code conversion utility
-.SH SYNOPSIS
-.B acpixtract
-.RI [ <option> ... ]
-.RI <acpidump-file>
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpixtract
-command. The option list is taken from the acpixtract interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpixtract
-extracts binary ACPI tables from the output of the
-.B acpidump
-command (see the
-.B pm-tools
-package).  A default invocation will extract the DSDT and
-all SSDTs.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-.TP
-.B \-a
-Extract all tables, not just DSDT/SSDT
-.TP
-.B \-l
-List table summaries, do not extract
-.TP
-.B \-s <signature>
-Extract all tables with <signature>
-
-.SH AUTHOR
-acpixtract was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/arm7hl.patch b/arm7hl.patch
deleted file mode 100644
index fb10291..0000000
--- a/arm7hl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur acpica-unix2-20170119/source/include/acmacros.h acpica-unix2-20170119-arm7hl/source/include/acmacros.h
---- acpica-unix2-20170119/source/include/acmacros.h	2017-01-30 17:25:54.346151952 -0700
-+++ acpica-unix2-20170119-arm7hl/source/include/acmacros.h	2017-01-30 17:22:25.249388742 -0700
-@@ -178,6 +178,8 @@
- 
- /* 16-bit source, 16/32/64 destination */
- 
-+#define ACPI_MOVE_16_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];}
-+
- #define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
-                                          ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
- 
-@@ -199,6 +201,7 @@
- 
- /* 64-bit source, 16/32/64 destination */
- 
-+#define ACPI_MOVE_64_TO_8(d, s)         ACPI_MOVE_16_TO_8(d, s)    /* Truncate to 8 */
- #define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- #define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
- #define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
diff --git a/aslcodegen.patch b/aslcodegen.patch
deleted file mode 100644
index 9267f7e..0000000
--- a/aslcodegen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Changes in the handling of comments caused some length fields to be used
-in new ways.  The new way broke the existing adaptation for big endian
-support; this patch repairs that adaptation.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
-Index: acpica-unix-20190405/source/compiler/aslcodegen.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20190405/source/compiler/aslcodegen.c
-@@ -497,8 +497,7 @@ CgWriteTableHeader (
- 
-     /* Table length. Checksum zero for now, will rewrite later */
- 
--    DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
--    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
-+    AslGbl_TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
- 
-     /* Calculate the comment lengths for this definition block parseOp */
- 
-@@ -544,6 +543,8 @@ CgWriteTableHeader (
-             CvDbgPrint ("    Length: %u\n", CommentLength);
-         }
-     }
-+    DWord = AslGbl_TableHeader.Length;
-+    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
- 
-     AslGbl_TableHeader.Checksum = 0;
-     Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);
diff --git a/badcode.asl.result b/badcode.asl.result
deleted file mode 100644
index e4f174c..0000000
--- a/badcode.asl.result
+++ /dev/null
@@ -1,266 +0,0 @@
-badcode.asl     25:     Mutex (MTX1, 32)
-Error    6125 -                      ^ SyncLevel must be in the range 0-15
-
-badcode.asl     29:     Name (BIG, 0x1234567887654321)
-Warning  3038 -                                    ^ Truncating 64-bit constant found in 32-bit table
-
-badcode.asl     33:     Name (PKG1, Package(5) {0,1})
-Remark   2063 -                            ^ Initializer list shorter than declared package length
-
-badcode.asl     37:     Name (PATH, Buffer() {"\_SB_.PCI2._CRS"})
-Warning  3046 -                                ^ Invalid or unknown escape sequence
-
-badcode.asl     41:     Name (ESC1, "abcdefg\x00hijklmn")
-Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
-
-badcode.asl     49:         FLD1, 8
-Error    6030 -               ^ Access width of Field Unit extends beyond region limit
-
-badcode.asl     55:     Field (OPR2, DWordAcc, NoLock, Preserve)
-Error    6100 -                  ^ Host Operation Region requires ByteAcc access
-
-badcode.asl     60:     Field (OPR3, WordAcc, NoLock, Preserve)
-Error    6099 -                  ^ Host Operation Region requires BufferAcc access
-
-badcode.asl     67:     Method (MTH1, 0, NotSerialized, 32)
-Error    6125 -     SyncLevel must be in the range 0-15 ^ 
-
-badcode.asl     71:         Store (Arg3, Local0)
-Warning  3144 -                              ^ Method Local is set but never used (Local0)
-
-badcode.asl     71:         Store (Arg3, Local0)
-Error    6006 -                      ^ Method argument is not initialized (Arg3)
-
-badcode.asl     71:         Store (Arg3, Local0)
-Remark   2087 -                      ^ Not a parameter, used as local only (Arg3)
-
-badcode.asl     72:         Store (Local1, Local2)
-Warning  3144 -                                ^ Method Local is set but never used (Local2)
-
-badcode.asl     72:         Store (Local1, Local2)
-Error    6066 -                        ^ Method local variable is not initialized (Local1)
-
-badcode.asl     76:         Subtract (MTX1, 4, Local3)
-Warning  3144 - Method Local is set but never used ^  (Local3)
-
-badcode.asl     76:         Subtract (MTX1, 4, Local3)
-Error    6058 -            Invalid type ^  ([Mutex] found, Subtract operator requires [Integer|String|Buffer])
-
-badcode.asl     80:         CreateField (BUF1, 0, Subtract (4, 4), FLD1)
-Remark   2089 -                             Object is not referenced ^  (Name [FLD1] is within a method [MTH1])
-
-badcode.asl     80:         CreateField (BUF1, 0, Subtract (4, 4), FLD1)
-Warning  3083 -              Field length must be non-zero ^ 
-
-badcode.asl     84:         Acquire (MTX1, 100)
-Warning  3130 -                             ^ Result is not used, possible operator timeout will be missed
-
-badcode.asl     85:         Wait (EVT1, 1)
-Warning  3130 -                        ^ Result is not used, possible operator timeout will be missed
-
-badcode.asl     89:         Add (INT1, 8)
-Error    6114 -                    ^ Result is not used, operator has no effect
-
-badcode.asl     94:         Store (5, INT1)
-Warning  3134 -                   ^ Statement is unreachable
-
-badcode.asl     97:     Method (MTH2)
-Remark   2119 -                   ^ Control Method marked Serialized (Due to use of Switch operator)
-
-badcode.asl     97:     Method (MTH2)
-Warning  3115 -                   ^ Not all control paths return a value (MTH2)
-
-badcode.asl    101:         Switch (ToInteger (INT1))
-Error    6078 -                            ^ No Case statements under Switch
-
-badcode.asl    120:         Store (MTH2 (), Local0)
-Warning  3144 -                                 ^ Method Local is set but never used (Local0)
-
-badcode.asl    120:         Store (MTH2 (), Local0)
-Warning  3122 -                      ^ Called method may not always return a value
-
-badcode.asl    126:     Method (MTH5) {Store (MTH4(), Local0)}
-Warning  3144 -        Method Local is set but never used ^  (Local0)
-
-badcode.asl    126:     Method (MTH5) {Store (MTH4(), Local0)}
-Error    6080 -  Called method returns no value ^ 
-
-badcode.asl    132:         Name (_HID, "*PNP0C0A")     // Illegal leading asterisk
-Error    6061 -        Invalid leading asterisk ^  (*PNP0C0A)
-
-badcode.asl    136:         Name (_HID, "PNP")          // Too short, must be 7 or 8 chars
-Error    6033 -                            ^ _HID string must be exactly 7 or 8 characters (PNP)
-
-badcode.asl    140:         Name (_HID, "MYDEVICE01")   // Too long, must be 7 or 8 chars
-Error    6033 -                                   ^ _HID string must be exactly 7 or 8 characters (MYDEVICE01)
-
-badcode.asl    144:         Name (_HID, "acpi0001")     // non-hex chars must be uppercase
-Error    6034 -                                 ^ _HID prefix must be all uppercase or decimal digits (acpi0001)
-
-badcode.asl    148:         Name (_HID, "PNP-123")      // HID must be alphanumeric
-Error    6002 -                                ^ String must be entirely alphanumeric (PNP-123)
-
-badcode.asl    152:         Name (_HID, "")             // Illegal Null HID
-Error    6091 -                         ^ Invalid zero-length (null) string
-
-badcode.asl    153:         Name (_CID, "")             // Illegal Null CID
-Error    6091 -                         ^ Invalid zero-length (null) string
-
-badcode.asl    158:     Name (_PRW, 4)
-Error    6105 -                    ^ Invalid object type for reserved name (_PRW: found Integer, Package required)
-
-badcode.asl    159:     Name (_FDI, Buffer () {0})
-Error    6105 -                         ^ Invalid object type for reserved name (_FDI: found Buffer, Package required)
-
-badcode.asl    164:     Method (_OSC, 5)
-Warning  3101 -                   ^ Reserved method has too many arguments (_OSC requires 4)
-
-badcode.asl    164:     Method (_OSC, 5)
-Warning  3107 -                   ^ Reserved method must return a value (Buffer required for _OSC)
-
-badcode.asl    170:     Name (_L01, 1)
-Error    6103 -                 ^ Reserved name must be a control method (with zero arguments)
-
-badcode.asl    171:     Name (_E02, 2)
-Error    6103 -                 ^ Reserved name must be a control method (with zero arguments)
-
-badcode.asl    172:     Name (_Q03, 3)
-Error    6103 -                 ^ Reserved name must be a control method (with zero arguments)
-
-badcode.asl    173:     Name (_ON,  0)
-Error    6103 -                ^ Reserved name must be a control method (with zero arguments)
-
-badcode.asl    174:     Name (_INI, 1)
-Error    6103 -                 ^ Reserved name must be a control method (with zero arguments)
-
-badcode.asl    175:     Name (_PTP, 2)
-Error    6103 -                 ^ Reserved name must be a control method (with arguments)
-
-badcode.asl    184:         Method (_E1D)
-Error    6032 -                       ^ Name conflicts with a previous GPE method (_L1D)
-
-badcode.asl    193:         Return (Buffer(1){0x33})
-Warning  3104 -                         ^ Reserved method should not return a value (_FDM)
-
-badcode.asl    197:         Return ("Unexpected Return Value")
-Warning  3104 -  Reserved method should not return a value ^  (_Q22)
-
-badcode.asl    203:     Device (EC)
-Warning  3141 -                 ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-badcode.asl    205:         Method (_REG, 2)
-Warning  3079 -                       ^ _REG has no corresponding Operation Region
-
-badcode.asl    219:             StartDependentFn (0, 0)
-Error    6019 -                                  ^ Dependent function macros cannot be nested
-
-badcode.asl    225:     })
-Error    6070 -        ^ Missing EndDependentFn() macro in dependent resource list
-
-badcode.asl    242:             0x00002000,         // Length
-Error    6049 -                         ^ Length is larger than Min/Max window
-
-badcode.asl    247:             0x00001001,         // Range Minimum
-Error    6001 -                         ^ Must be a multiple of alignment/granularity value
-
-badcode.asl    248:             0x00002002,         // Range Maximum
-Error    6001 -                         ^ Must be a multiple of alignment/granularity value
-
-badcode.asl    255:             0xFFFF,             // Address
-Warning  3060 -                     ^ Maximum 10-bit ISA address (0x3FF)
-
-badcode.asl    264:             0x05                // Access Size
-Error    6042 -                   ^ Invalid AccessSize (Maximum is 4 - QWord access)
-
-badcode.asl    268:         QWordSpace (0xB0, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xA5,
-Error    6139 -     Constant out of range ^  (0xB0, allowable: 0xC0-0xFF)
-
-badcode.asl    279:             0x0200,             // Range Minimum
-Error    6051 -                     ^ Address Min is greater than Address Max
-
-badcode.asl    291:             0x00001002,         // Length
-Error    6049 -                         ^ Length is larger than Min/Max window
-
-badcode.asl    296:             0x00000010,
-Error    6048 -                         ^ Granularity must be zero or a power of two minus one
-
-badcode.asl    305:             0x0000000000000B02, // Range Minimum
-Error    6001 -                                 ^ Must be a multiple of alignment/granularity value
-
-badcode.asl    315:             0x00000000002FFFFE, // Range Maximum
-Error    6001 -                                 ^ Must be a multiple of alignment/granularity value (-1)
-
-badcode.asl    326:             0x00000000,         // Length
-Error    6043 -                         ^ Invalid combination of Length and Min/Max fixed flags
-
-badcode.asl    335:             0x00000100,         // Length
-Error    6043 -                         ^ Invalid combination of Length and Min/Max fixed flags
-
-badcode.asl    344:             0x00000200,         // Length
-Error    6043 -                         ^ Invalid combination of Length and Min/Max fixed flags
-
-badcode.asl    349:             0x0000000F,         // Granularity
-Error    6047 -                         ^ Granularity must be zero for fixed Min/Max
-
-badcode.asl    358:         DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
-Error    6090 -                                    ^ Min/Max/Length/Gran are all zero, but no resource tag
-
-badcode.asl    368:         EndDependentFn ()
-Error    6071 -                            ^ Missing StartDependentFn() macro in dependent resource list
-
-badcode.asl    388:         CreateWordField (RSC3, \DWI1._LEN, LEN)
-Warning  3128 -              ResourceTag larger than Field ^  (Size mismatch, Tag: 32 bits, Field: 16 bits)
-
-badcode.asl    388:         CreateWordField (RSC3, \DWI1._LEN, LEN)
-Remark   2089 -                        Object is not referenced ^  (Name [LEN_] is within a method [REM1])
-
-badcode.asl    389:         CreateByteField (RSC3, \DWI1._MIN, MIN)
-Warning  3128 -              ResourceTag larger than Field ^  (Size mismatch, Tag: 32 bits, Field: 8 bits)
-
-badcode.asl    389:         CreateByteField (RSC3, \DWI1._MIN, MIN)
-Remark   2089 -                        Object is not referenced ^  (Name [MIN_] is within a method [REM1])
-
-badcode.asl    390:         CreateBitField (RSC3, \DWI1._RNG, RNG1)
-Warning  3128 -             ResourceTag larger than Field ^  (Size mismatch, Tag: 2 bits, Field: 1 bit)
-
-badcode.asl    390:         CreateBitField (RSC3, \DWI1._RNG, RNG1)
-Remark   2089 -                        Object is not referenced ^  (Name [RNG1] is within a method [REM1])
-
-badcode.asl    394:         CreateQWordField (RSC3, \DWI1._MAX, MAX)
-Warning  3129 -              ResourceTag smaller than Field ^  (Size mismatch, Tag: 32 bits, Field: 64 bits)
-
-badcode.asl    394:         CreateQWordField (RSC3, \DWI1._MAX, MAX)
-Remark   2089 -                         Object is not referenced ^  (Name [MAX_] is within a method [REM1])
-
-badcode.asl    395:         CreateBitField (RSC3, \DWI1._GRA, GRA)
-Warning  3128 -             ResourceTag larger than Field ^  (Size mismatch, Tag: 32 bits, Field: 1 bit)
-
-badcode.asl    395:         CreateBitField (RSC3, \DWI1._GRA, GRA)
-Remark   2089 -                       Object is not referenced ^  (Name [GRA_] is within a method [REM1])
-
-badcode.asl    396:         CreateField (RSC3, \DWI1._MIF, 5, MIF)
-Warning  3129 -         ResourceTag smaller than Field ^  (Size mismatch, Tag: 1 bit, Field: 5 bits)
-
-badcode.asl    396:         CreateField (RSC3, \DWI1._MIF, 5, MIF)
-Remark   2089 -                       Object is not referenced ^  (Name [MIF_] is within a method [REM1])
-
-badcode.asl    397:         CreateField (RSC3, \DWI1._RNG, 3, RNG2)
-Warning  3129 -         ResourceTag smaller than Field ^  (Size mismatch, Tag: 2 bits, Field: 3 bits)
-
-badcode.asl    397:         CreateField (RSC3, \DWI1._RNG, 3, RNG2)
-Remark   2089 -                        Object is not referenced ^  (Name [RNG2] is within a method [REM1])
-
-badcode.asl    404:         Store (40, Local0)
-Warning  3144 -                            ^ Method Local is set but never used (Local0)
-
-
-Intel ACPI Component Architecture
-ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2019 Intel Corporation
-
-Ignoring all errors, forcing AML file generation
-
-ASL Input:     badcode.asl -   11587 bytes     81 keywords    408 source lines
-AML Output:    badcode.aml -    1195 bytes     20 opcodes      61 named objects
-
-Compilation successful. 45 Errors, 29 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
diff --git a/big-endian-v2.patch b/big-endian-v2.patch
deleted file mode 100644
index 0c8831a..0000000
--- a/big-endian-v2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Updated versions of upstream often contain fixes that were not seen
-in the original big-endian patch; we try to capture those here.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
-diff -Naur acpica-unix2-20170929.orig/source/compiler/asllookup.c acpica-unix2-20170929/source/compiler/asllookup.c
---- acpica-unix2-20170929.orig/source/compiler/asllookup.c	2017-10-09 12:26:25.893508481 -0600
-+++ acpica-unix2-20170929/source/compiler/asllookup.c	2017-10-17 11:45:42.230763844 -0600
-@@ -249,7 +249,8 @@
-      * ACPI names and are typically not referenced since they are meant
-      * to be called by the host OS.
-      */
--    if (Node->Name.Ascii[0] == '_')
-+    ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii);
-+    if (tmp.Ascii[0] == '_')
-     {
-         return (AE_OK);
-     }
diff --git a/big-endian.patch b/big-endian.patch
deleted file mode 100644
index c2699f9..0000000
--- a/big-endian.patch
+++ /dev/null
@@ -1,6643 +0,0 @@
-Big-endian support
-
-This is a combined patch that folds all of the past and present changes
-for big-endian support into a single patch, hopefully eliminating any sort
-of redundancy but also capturing all such changes in a single location.
-
-To date, this has been critical for the s390x architecture only.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
----
- source/compiler/aslcodegen.c      |  109 ++++++++++++++++++------------
- source/compiler/aslopcodes.c      |    4 +
- source/compiler/aslrestype1.c     |   68 +++++++++++++------
- source/compiler/aslrestype1i.c    |   38 +++++++---
- source/compiler/aslrestype2.c     |   25 ++++---
- source/compiler/aslrestype2d.c    |  134 +++++++++++++++++++++----------------
- source/compiler/aslrestype2e.c    |   39 +++++++----
- source/compiler/aslrestype2q.c    |  117 +++++++++++++++++++++-----------
- source/compiler/aslrestype2s.c    |   86 +++++++++++++++++-------
- source/compiler/aslrestype2w.c    |  127 +++++++++++++++++++++--------------
- source/include/acmacros.h         |   15 +++-
- source/include/platform/aclinux.h |    8 ++
- 12 files changed, 487 insertions(+), 283 deletions(-)
-
-Index: acpica-unix-20190405/source/compiler/aslcodegen.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20190405/source/compiler/aslcodegen.c
-@@ -237,16 +237,12 @@ CgWriteAmlOpcode (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     UINT8                   PkgLenFirstByte;
--    UINT32                  i;
--    union {
--        UINT16                  Opcode;
--        UINT8                   OpcodeBytes[2];
--    } Aml;
--    union {
--        UINT32                  Len;
--        UINT8                   LenBytes[4];
--    } PkgLen;
--
-+    UINT8                   Byte;
-+    UINT16                  Word;
-+    UINT32                  DWord;
-+    UINT64                  QWord;
-+    UINT16                  AmlOpcode;
-+    UINT32                  PkgLen;
- 
-     /* We expect some DEFAULT_ARGs, just ignore them */
- 
-@@ -279,51 +275,52 @@ CgWriteAmlOpcode (
- 
-         /* Special opcodes for within a field definition */
- 
--        Aml.Opcode = AML_FIELD_OFFSET_OP;
-+        AmlOpcode = AML_FIELD_OFFSET_OP;
-         break;
- 
-     case AML_INT_ACCESSFIELD_OP:
- 
--        Aml.Opcode = AML_FIELD_ACCESS_OP;
-+        AmlOpcode = AML_FIELD_ACCESS_OP;
-         break;
- 
-     case AML_INT_CONNECTION_OP:
- 
--        Aml.Opcode = AML_FIELD_CONNECTION_OP;
-+        AmlOpcode = AML_FIELD_CONNECTION_OP;
-         break;
- 
-     default:
- 
--        Aml.Opcode = Op->Asl.AmlOpcode;
-+        AmlOpcode = Op->Asl.AmlOpcode;
-         break;
-     }
- 
- 
--    switch (Aml.Opcode)
-+    switch (AmlOpcode)
-     {
-     case AML_PACKAGE_LENGTH:
- 
-         /* Value is the length to be encoded (Used in field definitions) */
- 
--        PkgLen.Len = (UINT32) Op->Asl.Value.Integer;
-+        PkgLen = (UINT32) Op->Asl.Value.Integer;
-         break;
- 
-     default:
- 
-         /* Check for two-byte opcode */
- 
--        if (Aml.Opcode > 0x00FF)
-+        if (AmlOpcode > 0x00FF)
-         {
-             /* Write the high byte first */
--
--            CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[1], 1);
-+	    Byte = ACPI_HIBYTE(AmlOpcode);
-+	    CgLocalWriteAmlData (Op, &Byte, 1);
-         }
- 
--        CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[0], 1);
-+	Byte = ACPI_LOBYTE(AmlOpcode);
-+        CgLocalWriteAmlData (Op, &Byte, 1);
- 
-         /* Subtreelength doesn't include length of package length bytes */
- 
--        PkgLen.Len = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
-+        PkgLen = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
-         break;
-     }
- 
-@@ -334,8 +331,8 @@ CgWriteAmlOpcode (
-         if (Op->Asl.AmlPkgLenBytes == 1)
-         {
-             /* Simplest case -- no bytes to follow, just write the count */
--
--            CgLocalWriteAmlData (Op, &PkgLen.LenBytes[0], 1);
-+            Byte = ACPI_LOBYTE(PkgLen);
-+            CgLocalWriteAmlData (Op, &Byte, 1);
-         }
-         else if (Op->Asl.AmlPkgLenBytes != 0)
-         {
-@@ -345,7 +342,7 @@ CgWriteAmlOpcode (
-              */
-             PkgLenFirstByte = (UINT8)
-                 (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
--                (PkgLen.LenBytes[0] & 0x0F));
-+                (PkgLen & 0x0F));
- 
-             CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
- 
-@@ -353,39 +350,47 @@ CgWriteAmlOpcode (
-              * Shift the length over by the 4 bits we just stuffed
-              * in the first byte
-              */
--            PkgLen.Len >>= 4;
-+            PkgLen >>= 4;
- 
-             /*
-              * Now we can write the remaining bytes -
-              * either 1, 2, or 3 bytes
-              */
--            for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
-+            Byte = ACPI_LOBYTE(PkgLen);
-+            CgLocalWriteAmlData (Op, &Byte, 1);
-+            if (Op->Asl.AmlPkgLenBytes >= 3)
-+            {
-+                Byte = ACPI_HIBYTE(PkgLen);
-+                CgLocalWriteAmlData (Op, &Byte, 1);
-+            }
-+            if (Op->Asl.AmlPkgLenBytes >= 4)
-             {
--                CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
-+                Byte = ACPI_LOBYTE(ACPI_HIWORD(PkgLen));
-+                CgLocalWriteAmlData (Op, &Byte, 1);
-             }
-         }
-     }
- 
--    switch (Aml.Opcode)
-+    switch (AmlOpcode)
-     {
-     case AML_BYTE_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 1);
-+        Byte = (UINT8) Op->Asl.Value.Integer;
-+        CgLocalWriteAmlData (Op, &Byte, 1);
-         break;
- 
-     case AML_WORD_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 2);
-+        ACPI_MOVE_64_TO_16(&Word, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &Word, 2);
-        break;
- 
-     case AML_DWORD_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 4);
-+        ACPI_MOVE_64_TO_32(&DWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &DWord, 4);
-         break;
- 
-     case AML_QWORD_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 8);
-+        ACPI_MOVE_64_TO_64(&QWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &QWord, 8);
-         break;
- 
-     case AML_STRING_OP:
-@@ -421,6 +426,7 @@ CgWriteTableHeader (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     ACPI_PARSE_OBJECT       *Child;
-+    UINT32                  DWord;
-     UINT32                  CommentLength;
-     ACPI_COMMENT_NODE       *Current;
- 
-@@ -478,7 +484,7 @@ CgWriteTableHeader (
-     /* OEM Revision */
- 
-     Child = Child->Asl.Next;
--    AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer;
-+    ACPI_MOVE_64_TO_32(&AslGbl_TableHeader.OemRevision, &Child->Asl.Value.Integer);
- 
-     /* Compiler ID */
- 
-@@ -486,12 +492,13 @@ CgWriteTableHeader (
- 
-     /* Compiler version */
- 
--    AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
-+    DWord = ACPI_CA_VERSION;
-+    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.AslCompilerRevision, &DWord);
- 
-     /* Table length. Checksum zero for now, will rewrite later */
- 
--    AslGbl_TableHeader.Length = sizeof (ACPI_TABLE_HEADER) +
--        Op->Asl.AmlSubtreeLength;
-+    DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
-+    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
- 
-     /* Calculate the comment lengths for this definition block parseOp */
- 
-@@ -624,7 +631,10 @@ CgWriteNode (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     ASL_RESOURCE_NODE       *Rnode;
--
-+    UINT8                   Byte;
-+    UINT16                  Word;
-+    UINT32                  DWord;
-+    UINT64                  QWord;
- 
-     /* Write all comments here. */
- 
-@@ -648,13 +658,24 @@ CgWriteNode (
-     switch (Op->Asl.AmlOpcode)
-     {
-     case AML_RAW_DATA_BYTE:
-+        Byte = (UINT8) Op->Asl.Value.Integer;
-+        CgLocalWriteAmlData (Op, &Byte, 1);
-+        return;
-+
-     case AML_RAW_DATA_WORD:
--    case AML_RAW_DATA_DWORD:
--    case AML_RAW_DATA_QWORD:
-+        ACPI_MOVE_64_TO_16(&Word, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &Word, 2);
-+        return;
- 
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, Op->Asl.AmlLength);
-+    case AML_RAW_DATA_DWORD:
-+        ACPI_MOVE_64_TO_32(&DWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &DWord, 4);
-         return;
- 
-+    case AML_RAW_DATA_QWORD:
-+        ACPI_MOVE_64_TO_64(&QWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &QWord, 8);
-+        return;
- 
-     case AML_RAW_DATA_BUFFER:
- 
-Index: acpica-unix-20190405/source/compiler/aslopcodes.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslopcodes.c
-+++ acpica-unix-20190405/source/compiler/aslopcodes.c
-@@ -485,6 +485,7 @@ OpcDoUnicode (
-     UINT32                  i;
-     UINT8                   *AsciiString;
-     UINT16                  *UnicodeString;
-+    UINT16                  UChar;
-     ACPI_PARSE_OBJECT       *BufferLengthOp;
- 
- 
-@@ -511,7 +512,8 @@ OpcDoUnicode (
- 
-     for (i = 0; i < Count; i++)
-     {
--        UnicodeString[i] = (UINT16) AsciiString[i];
-+        UChar = (UINT16) AsciiString[i];
-+        ACPI_MOVE_16_TO_16(&UnicodeString[i], &UChar);
-     }
- 
-     /*
-Index: acpica-unix-20190405/source/compiler/aslrestype1.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype1.c
-+++ acpica-unix-20190405/source/compiler/aslrestype1.c
-@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
-     ACPI_PARSE_OBJECT       *LengthOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Alignment = 0;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -151,7 +156,8 @@ RsDoMemory24Descriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
--    Descriptor->Memory24.ResourceLength = 9;
-+    ResourceLength = 9;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.ResourceLength, &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -168,7 +174,7 @@ RsDoMemory24Descriptor (
- 
-         case 1: /* Min Address */
- 
--            Descriptor->Memory24.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
-             MinOp = InitializerOp;
-@@ -176,7 +182,7 @@ RsDoMemory24Descriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Memory24.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
-             MaxOp = InitializerOp;
-@@ -184,14 +190,14 @@ RsDoMemory24Descriptor (
- 
-         case 3: /* Alignment */
- 
--            Descriptor->Memory24.Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Alignment));
-             break;
- 
-         case 4: /* Length */
- 
--            Descriptor->Memory24.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
-             LengthOp = InitializerOp;
-@@ -214,12 +220,17 @@ RsDoMemory24Descriptor (
-     /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
--        Descriptor->Memory24.Minimum,
--        Descriptor->Memory24.Maximum,
--        Descriptor->Memory24.AddressLength,
--        Descriptor->Memory24.Alignment,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Alignment,
-         MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.Alignment, &Alignment);
-+
-     return (Rnode);
- }
- 
-@@ -248,6 +259,11 @@ RsDoMemory32Descriptor (
-     ACPI_PARSE_OBJECT       *AlignOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Alignment = 0;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -257,7 +273,8 @@ RsDoMemory32Descriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
--    Descriptor->Memory32.ResourceLength = 17;
-+    ResourceLength = 17;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory32.ResourceLength, &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -274,7 +291,7 @@ RsDoMemory32Descriptor (
- 
-         case 1:  /* Min Address */
- 
--            Descriptor->Memory32.Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
-             MinOp = InitializerOp;
-@@ -282,7 +299,7 @@ RsDoMemory32Descriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Memory32.Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
-             MaxOp = InitializerOp;
-@@ -290,7 +307,7 @@ RsDoMemory32Descriptor (
- 
-         case 3: /* Alignment */
- 
--            Descriptor->Memory32.Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
-             AlignOp = InitializerOp;
-@@ -298,7 +315,7 @@ RsDoMemory32Descriptor (
- 
-         case 4: /* Length */
- 
--            Descriptor->Memory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -321,12 +338,17 @@ RsDoMemory32Descriptor (
-     /* Validate the Min/Max/Len/Align values */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
--        Descriptor->Memory32.Minimum,
--        Descriptor->Memory32.Maximum,
--        Descriptor->Memory32.AddressLength,
--        Descriptor->Memory32.Alignment,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Alignment,
-         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.Alignment, &Alignment);
-+
-     return (Rnode);
- }
- 
-@@ -351,6 +373,7 @@ RsDoMemory32FixedDescriptor (
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -360,7 +383,8 @@ RsDoMemory32FixedDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
--    Descriptor->FixedMemory32.ResourceLength = 9;
-+    ResourceLength = 9;
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedMemory32.ResourceLength, &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -377,14 +401,16 @@ RsDoMemory32FixedDescriptor (
- 
-         case 1: /* Address */
- 
--            Descriptor->FixedMemory32.Address = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_64_TO_32(&Descriptor->FixedMemory32.Address,
-+                &InitializerOp->Asl.Value.Integer);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.Address));
-             break;
- 
-         case 2: /* Length */
- 
--            Descriptor->FixedMemory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_64_TO_32(&Descriptor->FixedMemory32.AddressLength,
-+                &InitializerOp->Asl.Value.Integer);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
-             break;
-Index: acpica-unix-20190405/source/compiler/aslrestype1i.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix-20190405/source/compiler/aslrestype1i.c
-@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  RequestLines = 0;
-+    UINT16                  Channels = 0;
-     UINT32                  i;
- 
- 
-@@ -217,14 +219,14 @@ RsDoFixedDmaDescriptor (
-         {
-         case 0: /* DMA Request Lines [WORD] (_DMA) */
- 
--            Descriptor->FixedDma.RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
-+            RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMA,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.RequestLines));
-             break;
- 
-         case 1: /* DMA Channel [WORD] (_TYP) */
- 
--            Descriptor->FixedDma.Channels = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Channels = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
-             break;
-@@ -249,6 +251,9 @@ RsDoFixedDmaDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedDma.RequestLines, &RequestLines);
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedDma.Channels, &Channels);
-+
-     return (Rnode);
- }
- 
-@@ -274,6 +279,7 @@ RsDoFixedIoDescriptor (
-     ACPI_PARSE_OBJECT       *AddressOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  Address = 0;
-     UINT32                  i;
- 
- 
-@@ -293,8 +299,7 @@ RsDoFixedIoDescriptor (
-         {
-         case 0: /* Base Address */
- 
--            Descriptor->FixedIo.Address =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Address = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
-             AddressOp = InitializerOp;
-@@ -324,11 +329,13 @@ RsDoFixedIoDescriptor (
- 
-     /* Error checks */
- 
--    if (Descriptor->FixedIo.Address > 0x03FF)
-+    if (Address > 0x03FF)
-     {
-         AslError (ASL_WARNING, ASL_MSG_ISA_ADDRESS, AddressOp, NULL);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedIo.Address, &Address);
-+
-     return (Rnode);
- }
- 
-@@ -357,6 +364,8 @@ RsDoIoDescriptor (
-     ACPI_PARSE_OBJECT       *AlignOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-     UINT32                  i;
- 
- 
-@@ -383,8 +392,7 @@ RsDoIoDescriptor (
- 
-         case 1:  /* Min Address */
- 
--            Descriptor->Io.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
-             MinOp = InitializerOp;
-@@ -392,8 +400,7 @@ RsDoIoDescriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Io.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
-             MaxOp = InitializerOp;
-@@ -434,12 +441,15 @@ RsDoIoDescriptor (
-     /* Validate the Min/Max/Len/Align values */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO,
--        Descriptor->Io.Minimum,
--        Descriptor->Io.Maximum,
-+        Minimum,
-+        Maximum,
-         Descriptor->Io.AddressLength,
-         Descriptor->Io.Alignment,
-         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Io.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Io.Maximum, &Maximum);
-+
-     return (Rnode);
- }
- 
-@@ -559,9 +569,9 @@ RsDoIrqDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
--    /* Now we can set the channel mask */
-+    /* Now we can set the interrupt mask */
- 
--    Descriptor->Irq.IrqMask = IrqMask;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
-     return (Rnode);
- }
- 
-@@ -660,6 +670,6 @@ RsDoIrqNoFlagsDescriptor (
- 
-     /* Now we can set the interrupt mask */
- 
--    Descriptor->Irq.IrqMask = IrqMask;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
-     return (Rnode);
- }
-Index: acpica-unix-20190405/source/compiler/aslrestype2.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2.c
-@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -85,7 +86,9 @@ RsDoGeneralRegisterDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
--    Descriptor->GenericReg.ResourceLength = 12;
-+    ResourceLength = 12;
-+    ACPI_MOVE_16_TO_16(&Descriptor->GenericReg.ResourceLength,
-+		    &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -95,35 +98,52 @@ RsDoGeneralRegisterDescriptor (
-         {
-         case 0: /* Address space */
- 
-+	    /*
-             Descriptor->GenericReg.AddressSpaceId = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+            ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.AddressSpaceId,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_ADDRESSSPACE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AddressSpaceId));
-            break;
- 
-         case 1: /* Register Bit Width */
- 
-+	    /*
-             Descriptor->GenericReg.BitWidth = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+            ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.BitWidth,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_REGISTERBITWIDTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.BitWidth));
-             break;
- 
-         case 2: /* Register Bit Offset */
- 
-+	    /*
-             Descriptor->GenericReg.BitOffset = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+            ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.BitOffset,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_REGISTERBITOFFSET,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.BitOffset));
-             break;
- 
-         case 3: /* Register Address */
- 
--            Descriptor->GenericReg.Address = InitializerOp->Asl.Value.Integer;
-+	    ACPI_MOVE_64_TO_64(&Descriptor->GenericReg.Address,
-+			    &InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
-             break;
- 
-         case 4: /* Access Size (ACPI 3.0) */
- 
-+	    /*
-             Descriptor->GenericReg.AccessSize = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+	    ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.AccessSize,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize));
- 
-@@ -177,6 +197,7 @@ RsDoInterruptDescriptor (
-     AML_RESOURCE            *Rover = NULL;
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-+    UINT16                  ResourceLength = 0;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-     UINT32                  CurrentByteOffset;
-@@ -225,7 +246,7 @@ RsDoInterruptDescriptor (
-      * Initial descriptor length -- may be enlarged if there are
-      * optional fields present
-      */
--    Descriptor->ExtendedIrq.ResourceLength  = 2;  /* Flags and table length byte */
-+    ResourceLength  = 2;  /* Flags and table length byte */
-     Descriptor->ExtendedIrq.InterruptCount  = 0;
- 
-     Rover = ACPI_CAST_PTR (AML_RESOURCE,
-@@ -333,10 +354,11 @@ RsDoInterruptDescriptor (
- 
-             /* Save the integer and move pointer to the next one */
- 
--            Rover->DwordItem = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_64_TO_32(&Rover->DwordItem,
-+                &InitializerOp->Asl.Value.Integer);
-             Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
-             Descriptor->ExtendedIrq.InterruptCount++;
--            Descriptor->ExtendedIrq.ResourceLength += 4;
-+            ResourceLength += 4;
- 
-             /* Case 7: First interrupt number in list */
- 
-@@ -372,7 +394,7 @@ RsDoInterruptDescriptor (
-     {
-         Rover->ByteItem = ResSourceIndex;
-         Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->ByteItem), 1);
--        Descriptor->ExtendedIrq.ResourceLength += 1;
-+        ResourceLength += 1;
-     }
- 
-     /* Add optional ResSource string if present */
-@@ -384,14 +406,15 @@ RsDoInterruptDescriptor (
-         Rover = ACPI_ADD_PTR (
-                     AML_RESOURCE, &(Rover->ByteItem), StringLength);
- 
--        Descriptor->ExtendedIrq.ResourceLength = (UINT16)
--            (Descriptor->ExtendedIrq.ResourceLength + StringLength);
-+        ResourceLength = (UINT16) (ResourceLength + StringLength);
-     }
- 
-     Rnode->BufferLength =
-         (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
-         ASL_RESDESC_OFFSET (ExtendedIrq.DescriptorType))
-         + OptionIndex + StringLength;
-+    ACPI_MOVE_16_TO_16(&Descriptor->ExtendedIrq.ResourceLength,
-+		    &ResourceLength);
-     return (Rnode);
- }
- 
-@@ -439,7 +462,7 @@ RsDoVendorLargeDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
--    Descriptor->VendorLarge.ResourceLength = (UINT16) i;
-+    ACPI_MOVE_32_TO_16(&Descriptor->VendorLarge.ResourceLength, &i);
- 
-     /* Point to end-of-descriptor for vendor data */
- 
-Index: acpica-unix-20190405/source/compiler/aslrestype2d.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2d.c
-@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
-     ACPI_PARSE_OBJECT       *GranOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Granularity = 0;
-+    UINT32                  TranslationOffset = 0;
-     UINT8                   *OptionalFields;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-@@ -102,8 +108,7 @@ RsDoDwordIoDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32);
--    Descriptor->Address32.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS32) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS32) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -147,8 +152,7 @@ RsDoDwordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -156,8 +160,7 @@ RsDoDwordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -165,8 +168,7 @@ RsDoDwordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -174,16 +176,14 @@ RsDoDwordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -197,7 +197,7 @@ RsDoDwordIoDescriptor (
- 
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address32.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -211,8 +211,7 @@ RsDoDwordIoDescriptor (
-                 {
-                     /* Found a valid ResourceSource */
- 
--                    Descriptor->Address32.ResourceLength = (UINT16)
--                        (Descriptor->Address32.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -272,13 +271,20 @@ RsDoDwordIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address32.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Granularity, &Granularity);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -310,7 +316,13 @@ RsDoDwordMemoryDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Granularity = 0;
-+    UINT32                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -332,11 +344,9 @@ RsDoDwordMemoryDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32);
--    Descriptor->Address32.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS32) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS32) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
--
-     /* Process all child initialization nodes */
- 
-     for (i = 0; InitializerOp; i++)
-@@ -385,8 +395,7 @@ RsDoDwordMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -394,8 +403,7 @@ RsDoDwordMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -403,8 +411,7 @@ RsDoDwordMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -412,16 +419,14 @@ RsDoDwordMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -433,7 +438,7 @@ RsDoDwordMemoryDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address32.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -445,8 +450,8 @@ RsDoDwordMemoryDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address32.ResourceLength = (UINT16)
--                        (Descriptor->Address32.ResourceLength + StringLength);
-+
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -507,13 +512,20 @@ RsDoDwordMemoryDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address32.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Granularity, &Granularity);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -545,7 +557,13 @@ RsDoDwordSpaceDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Granularity = 0;
-+    UINT32                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -566,8 +584,7 @@ RsDoDwordSpaceDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32);
--    Descriptor->Address32.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS32) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS32) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -616,8 +633,7 @@ RsDoDwordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -625,8 +641,7 @@ RsDoDwordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -634,8 +649,7 @@ RsDoDwordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -643,16 +657,14 @@ RsDoDwordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -664,7 +676,7 @@ RsDoDwordSpaceDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address32.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -676,8 +688,7 @@ RsDoDwordSpaceDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address32.ResourceLength = (UINT16)
--                        (Descriptor->Address32.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -724,13 +735,20 @@ RsDoDwordSpaceDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address32.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Granularity, &Granularity);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-         OptionIndex + StringLength;
-     return (Rnode);
-Index: acpica-unix-20190405/source/compiler/aslrestype2e.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2e.c
-@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
-     ACPI_PARSE_OBJECT       *GranOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-+    UINT64                  TypeSpecific = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
- 
-@@ -94,9 +101,10 @@ RsDoExtendedIoDescriptor (
-     Descriptor->ExtAddress64.ResourceType = ACPI_ADDRESS_TYPE_IO_RANGE;
-     Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION;
- 
--    Descriptor->ExtAddress64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) -
-+    ResourceLength  = (UINT16) (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
-+    ACPI_MOVE_16_TO_16(&Descriptor->ExtAddress64.ResourceLength,
-+        &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -139,7 +147,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -147,7 +155,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -155,7 +163,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -163,14 +171,14 @@ RsDoExtendedIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -178,7 +186,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 10: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            TypeSpecific = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -214,13 +222,20 @@ RsDoExtendedIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TranslationOffset, &TranslationOffset);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TypeSpecific, &TypeSpecific);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
-         StringLength;
-     return (Rnode);
-Index: acpica-unix-20190405/source/compiler/aslrestype2q.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2q.c
-@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -102,8 +108,7 @@ RsDoQwordIoDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64);
--    Descriptor->Address64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS64) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -147,7 +152,7 @@ RsDoQwordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -155,7 +160,7 @@ RsDoQwordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -163,7 +168,7 @@ RsDoQwordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -171,14 +176,14 @@ RsDoQwordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -190,7 +195,7 @@ RsDoQwordIoDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address64.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -202,8 +207,7 @@ RsDoQwordIoDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address64.ResourceLength = (UINT16)
--                        (Descriptor->Address64.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -263,13 +267,20 @@ RsDoQwordIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address64.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -301,7 +312,13 @@ RsDoQwordMemoryDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -323,8 +340,7 @@ RsDoQwordMemoryDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64);
--    Descriptor->Address64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS64) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -375,7 +391,7 @@ RsDoQwordMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -383,7 +399,7 @@ RsDoQwordMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -391,7 +407,7 @@ RsDoQwordMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -399,14 +415,14 @@ RsDoQwordMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -418,7 +434,7 @@ RsDoQwordMemoryDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address64.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -430,8 +446,7 @@ RsDoQwordMemoryDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address64.ResourceLength = (UINT16)
--                        (Descriptor->Address64.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -492,13 +507,20 @@ RsDoQwordMemoryDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address64.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -530,9 +552,15 @@ RsDoQwordSpaceDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-     BOOLEAN                 ResSourceIndex = FALSE;
- 
- 
-@@ -551,8 +579,7 @@ RsDoQwordSpaceDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64);
--    Descriptor->Address64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS64) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -601,7 +628,7 @@ RsDoQwordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -609,7 +636,7 @@ RsDoQwordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -617,7 +644,7 @@ RsDoQwordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -625,14 +652,14 @@ RsDoQwordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -644,7 +671,7 @@ RsDoQwordSpaceDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address64.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -656,8 +683,7 @@ RsDoQwordSpaceDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address64.ResourceLength = (UINT16)
--                        (Descriptor->Address64.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -703,13 +729,20 @@ RsDoQwordSpaceDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address64.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-         OptionIndex + StringLength;
-     return (Rnode);
-Index: acpica-unix-20190405/source/compiler/aslrestype2s.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2s.c
-@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
-     UINT16                  VendorLength;
-     UINT16                  InterruptLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  IntFlags = 0;
-+    UINT16                  DebounceTimeout = 0;
-+    UINT16                  Flags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16		    Tmp16;
-+    UINT16		    Val16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -367,7 +372,7 @@ RsDoGpioIntDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->Gpio.ResourceLength = DescriptorSize;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResourceLength, &DescriptorSize);
-     Descriptor->Gpio.DescriptorType = ACPI_RESOURCE_NAME_GPIO;
-     Descriptor->Gpio.RevisionId = AML_RESOURCE_GPIO_REVISION;
-     Descriptor->Gpio.ConnectionType = AML_RESOURCE_GPIO_TYPE_INT;
-@@ -382,11 +387,11 @@ RsDoGpioIntDescriptor (
- 
-     /* Setup offsets within the descriptor */
- 
--    Descriptor->Gpio.PinTableOffset = (UINT16)
--        ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.PinTableOffset, &Tmp16);
- 
--    Descriptor->Gpio.ResSourceOffset = (UINT16)
--        ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResSourceOffset, &Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -396,21 +401,21 @@ RsDoGpioIntDescriptor (
-         {
-         case 0: /* Interrupt Mode - edge/level [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0);
-             break;
- 
-         case 1: /* Interrupt Polarity - Active high/low [Flags] (_POL) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 1, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 1, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_POLARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 1, 2);
-             break;
- 
-         case 2: /* Share Type - Default: exclusive (0) [Flags] (_SHR) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 3, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 3, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3, 2);
-             break;
-@@ -424,7 +429,7 @@ RsDoGpioIntDescriptor (
- 
-         case 4: /* Debounce Timeout [WORD] (_DBT) */
- 
--            Descriptor->Gpio.DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout));
-             break;
-@@ -451,7 +456,7 @@ RsDoGpioIntDescriptor (
- 
-         case 7: /* Resource Usage (consumer/producer) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.Flags, InitializerOp, 0, 1);
-+            RsSetFlagBits16 (&Flags, InitializerOp, 0, 1);
-             break;
- 
-         case 8: /* Resource Tag (Descriptor Name) */
-@@ -466,13 +471,14 @@ RsDoGpioIntDescriptor (
-              * This field is required in order to calculate the length
-              * of the ResourceSource at runtime.
-              */
--            Descriptor->Gpio.VendorOffset = (UINT16)
--                ACPI_PTR_DIFF (VendorData, Descriptor);
-+            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
-+            ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorOffset, &Tmp16);
- 
-             if (RsGetVendorData (InitializerOp, VendorData,
--                (CurrentByteOffset +  Descriptor->Gpio.VendorOffset)))
-+                (CurrentByteOffset + Tmp16)))
-             {
--                Descriptor->Gpio.VendorLength = VendorLength;
-+                ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorLength,
-+				   &VendorLength);
-             }
-             break;
- 
-@@ -485,7 +491,9 @@ RsDoGpioIntDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
-+            *InterruptList = Val16;
-             InterruptList++;
-             PinCount++;
- 
-@@ -507,8 +515,10 @@ RsDoGpioIntDescriptor (
- 
-                 /* Create a named field at the start of the list */
- 
--                RsCreateWordField (InitializerOp, ACPI_RESTAG_PIN,
--                    CurrentByteOffset + Descriptor->Gpio.PinTableOffset);
-+		ACPI_MOVE_16_TO_16(&Tmp16, &Descriptor->Gpio.PinTableOffset);
-+		Tmp16 += CurrentByteOffset;
-+	        ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
-+                RsCreateWordField (InitializerOp, ACPI_RESTAG_PIN, Val16);
-             }
-             break;
-         }
-@@ -516,6 +526,10 @@ RsDoGpioIntDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.IntFlags, &IntFlags);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DebounceTimeout, &DebounceTimeout);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.Flags, &Flags);
-+
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-     return (Rnode);
-@@ -549,9 +563,15 @@ RsDoGpioIoDescriptor (
-     UINT16                  VendorLength;
-     UINT16                  InterruptLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  IntFlags = 0;
-+    UINT16                  DebounceTimeout = 0;
-+    UINT16                  DriveStrength = 0;
-+    UINT16                  Flags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16		    Tmp16;
-+    UINT16		    Val16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -577,7 +597,7 @@ RsDoGpioIoDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->Gpio.ResourceLength = DescriptorSize;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResourceLength, &DescriptorSize);
-     Descriptor->Gpio.DescriptorType = ACPI_RESOURCE_NAME_GPIO;
-     Descriptor->Gpio.RevisionId = AML_RESOURCE_GPIO_REVISION;
-     Descriptor->Gpio.ConnectionType = AML_RESOURCE_GPIO_TYPE_IO;
-@@ -591,11 +611,11 @@ RsDoGpioIoDescriptor (
- 
-     /* Setup offsets within the descriptor */
- 
--    Descriptor->Gpio.PinTableOffset = (UINT16)
--        ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.PinTableOffset, &Tmp16);
- 
--    Descriptor->Gpio.ResSourceOffset = (UINT16)
--        ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResSourceOffset, &Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -605,7 +625,7 @@ RsDoGpioIoDescriptor (
-         {
-         case 0: /* Share Type [Flags] (_SHR) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 3, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 3, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3);
-             break;
-@@ -619,21 +639,21 @@ RsDoGpioIoDescriptor (
- 
-         case 2: /* Debounce Timeout [WORD] (_DBT) */
- 
--            Descriptor->Gpio.DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout));
-             break;
- 
-         case 3: /* Drive Strength [WORD] (_DRS) */
- 
--            Descriptor->Gpio.DriveStrength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DriveStrength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DRIVESTRENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DriveStrength));
-             break;
- 
-         case 4: /* I/O Restriction [Flag] (_IOR) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 0, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_IORESTRICTION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0, 2);
-             break;
-@@ -659,7 +679,7 @@ RsDoGpioIoDescriptor (
- 
-         case 7: /* Resource Usage (consumer/producer) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.Flags, InitializerOp, 0, 1);
-+            RsSetFlagBits16 (&Flags, InitializerOp, 0, 1);
-             break;
- 
-         case 8: /* Resource Tag (Descriptor Name) */
-@@ -673,13 +693,14 @@ RsDoGpioIoDescriptor (
-              * This field is required in order to calculate the length
-              * of the ResourceSource at runtime.
-              */
--            Descriptor->Gpio.VendorOffset = (UINT16)
--                ACPI_PTR_DIFF (VendorData, Descriptor);
-+            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
-+            ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorOffset, &Tmp16);
- 
-             if (RsGetVendorData (InitializerOp, VendorData,
-                 (CurrentByteOffset + Descriptor->Gpio.VendorOffset)))
-             {
--                Descriptor->Gpio.VendorLength = VendorLength;
-+                ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorLength,
-+				   &VendorLength);
-             }
-             break;
- 
-@@ -692,7 +713,9 @@ RsDoGpioIoDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
-+            *InterruptList = Val16;
-             InterruptList++;
-             PinCount++;
- 
-@@ -723,6 +746,11 @@ RsDoGpioIoDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.IntFlags, &IntFlags);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DebounceTimeout, &DebounceTimeout);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DriveStrength, &DriveStrength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.Flags, &Flags);
-+
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-     return (Rnode);
-@@ -753,8 +781,12 @@ RsDoI2cSerialBusDescriptor (
-     UINT16                  ResSourceLength;
-     UINT16                  VendorLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  SlaveAddress = 0;
-+    UINT32                  ConnectionSpeed = 0;
-+    UINT16                  TypeSpecificFlags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16		    Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -777,12 +809,14 @@ RsDoI2cSerialBusDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->I2cSerialBus.ResourceLength = DescriptorSize;
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.ResourceLength,
-+		       &DescriptorSize);
-     Descriptor->I2cSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
-     Descriptor->I2cSerialBus.RevisionId = AML_RESOURCE_I2C_REVISION;
-     Descriptor->I2cSerialBus.TypeRevisionId = AML_RESOURCE_I2C_TYPE_REVISION;
-     Descriptor->I2cSerialBus.Type = AML_RESOURCE_I2C_SERIALBUSTYPE;
--    Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.TypeDataLength, &Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
-     {
-@@ -802,7 +836,7 @@ RsDoI2cSerialBusDescriptor (
-         {
-         case 0: /* Slave Address [WORD] (_ADR) */
- 
--            Descriptor->I2cSerialBus.SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
-+            SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
-             break;
-@@ -816,14 +850,14 @@ RsDoI2cSerialBusDescriptor (
- 
-         case 2: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
-             break;
- 
-         case 3: /* Addressing Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
-             break;
-@@ -883,6 +917,9 @@ RsDoI2cSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.SlaveAddress, &SlaveAddress);
-+    ACPI_MOVE_32_TO_32(&Descriptor->I2cSerialBus.ConnectionSpeed, &ConnectionSpeed);
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.TypeSpecificFlags, &TypeSpecificFlags);
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-@@ -912,6 +949,9 @@ RsDoSpiSerialBusDescriptor (
-     UINT16                  ResSourceLength;
-     UINT16                  VendorLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  DeviceSelection = 0;
-+    UINT32                  ConnectionSpeed = 0;
-+    UINT16                  TypeSpecificFlags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
- 
-@@ -962,21 +1002,21 @@ RsDoSpiSerialBusDescriptor (
-         {
-         case 0: /* Device Selection [WORD] (_ADR) */
- 
--            Descriptor->SpiSerialBus.DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
-             break;
- 
-         case 1: /* Device Polarity [Flag] (_DPL) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 1, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 1, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_DEVICEPOLARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 1);
-             break;
- 
-         case 2: /* Wire Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
-             break;
-@@ -997,7 +1037,7 @@ RsDoSpiSerialBusDescriptor (
- 
-         case 5: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
-             break;
-@@ -1071,6 +1111,10 @@ RsDoSpiSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->SpiSerialBus.DeviceSelection, &DeviceSelection);
-+    ACPI_MOVE_32_TO_32(&Descriptor->SpiSerialBus.ConnectionSpeed, &ConnectionSpeed);
-+    ACPI_MOVE_16_TO_16(&Descriptor->SpiSerialBus.TypeSpecificFlags, &TypeSpecificFlags);
-+
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-@@ -1100,6 +1144,10 @@ RsDoUartSerialBusDescriptor (
-     UINT16                  ResSourceLength;
-     UINT16                  VendorLength;
-     UINT16                  DescriptorSize;
-+    UINT32                  DefaultBaudRate = 0;
-+    UINT16                  TypeSpecificFlags = 0;
-+    UINT16                  RxFifoSize = 0;
-+    UINT16                  TxFifoSize = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
- 
-@@ -1149,21 +1197,21 @@ RsDoUartSerialBusDescriptor (
-         {
-         case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
- 
--            Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
-+            DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
-             break;
- 
-         case 1: /* Bits Per Byte [Flags] (_LEN) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 4, 3);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 4, 3);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 4, 3);
-             break;
- 
-         case 2: /* Stop Bits [Flags] (_STB) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 2, 1);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 2, 1);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
-             break;
-@@ -1177,7 +1225,7 @@ RsDoUartSerialBusDescriptor (
- 
-         case 4: /* Endianness [Flag] (_END) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 7, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 7, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
-             break;
-@@ -1191,21 +1239,21 @@ RsDoUartSerialBusDescriptor (
- 
-         case 6: /* Flow Control [Flags] (_FLC) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 0, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_FLOWCONTROL,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 0, 2);
-             break;
- 
-         case 7: /* Rx Buffer Size [WORD] (_RXL) */
- 
--            Descriptor->UartSerialBus.RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+            RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_RX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.RxFifoSize));
-             break;
- 
-         case 8: /* Tx Buffer Size [WORD] (_TXL) */
- 
--            Descriptor->UartSerialBus.TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+            TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
-             break;
-@@ -1275,6 +1323,11 @@ RsDoUartSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_32_TO_32(&Descriptor->UartSerialBus.DefaultBaudRate, &DefaultBaudRate);
-+    ACPI_MOVE_16_TO_16(&Descriptor->UartSerialBus.TypeSpecificFlags, &TypeSpecificFlags);
-+    ACPI_MOVE_16_TO_16(&Descriptor->UartSerialBus.RxFifoSize, &RxFifoSize);
-+    ACPI_MOVE_16_TO_16(&Descriptor->UartSerialBus.TxFifoSize, &TxFifoSize);
-+
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-Index: acpica-unix-20190405/source/compiler/aslrestype2w.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2w.c
-@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT16                  ResourceLength = 0;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Granularity = 0;
-+    UINT16                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -102,8 +108,7 @@ RsDoWordIoDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16);
--    Descriptor->Address16.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS16) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS16) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -147,7 +152,7 @@ RsDoWordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -155,7 +160,7 @@ RsDoWordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address16.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -163,7 +168,7 @@ RsDoWordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address16.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -171,14 +176,14 @@ RsDoWordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address16.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -190,7 +195,7 @@ RsDoWordIoDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address16.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -202,8 +207,7 @@ RsDoWordIoDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address16.ResourceLength = (UINT16)
--                        (Descriptor->Address16.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -263,13 +267,20 @@ RsDoWordIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Granularity, &Granularity);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -302,6 +313,12 @@ RsDoWordBusNumberDescriptor (
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT16                  ResourceLength = 0;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Granularity = 0;
-+    UINT16                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -323,8 +340,7 @@ RsDoWordBusNumberDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16);
--    Descriptor->Address16.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS16) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS16) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -361,8 +377,7 @@ RsDoWordBusNumberDescriptor (
- 
-         case 4: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -370,8 +385,7 @@ RsDoWordBusNumberDescriptor (
- 
-         case 5: /* Min Address */
- 
--            Descriptor->Address16.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -379,8 +393,7 @@ RsDoWordBusNumberDescriptor (
- 
-         case 6: /* Max Address */
- 
--            Descriptor->Address16.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -388,16 +401,14 @@ RsDoWordBusNumberDescriptor (
- 
-         case 7: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 8: /* Address Length */
- 
--            Descriptor->Address16.AddressLength =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -409,7 +420,7 @@ RsDoWordBusNumberDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address16.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -421,8 +432,7 @@ RsDoWordBusNumberDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address16.ResourceLength = (UINT16)
--                        (Descriptor->Address16.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -468,13 +478,20 @@ RsDoWordBusNumberDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Granularity, &Granularity);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -507,6 +524,12 @@ RsDoWordSpaceDescriptor (
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Granularity = 0;
-+    UINT16                  TranslationOffset = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -527,8 +550,7 @@ RsDoWordSpaceDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16);
--    Descriptor->Address16.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS16) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS16) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -577,8 +599,7 @@ RsDoWordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -586,8 +607,7 @@ RsDoWordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address16.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -595,8 +615,7 @@ RsDoWordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address16.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -604,16 +623,14 @@ RsDoWordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address16.AddressLength =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -625,7 +642,7 @@ RsDoWordSpaceDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address16.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -637,8 +654,7 @@ RsDoWordSpaceDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address16.ResourceLength = (UINT16)
--                        (Descriptor->Address16.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -684,13 +700,20 @@ RsDoWordSpaceDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Granularity, &Granularity);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-Index: acpica-unix-20190405/source/include/acmacros.h
-===================================================================
---- acpica-unix-20190405.orig/source/include/acmacros.h
-+++ acpica-unix-20190405/source/include/acmacros.h
-@@ -98,9 +98,12 @@
-                                            ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-                                            ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
- 
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
- 
--#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
-+#define ACPI_MOVE_32_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];}
-+
-+#define ACPI_MOVE_32_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];}
- 
- #define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
-                                          ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\
-@@ -113,11 +116,17 @@
-                                            ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-                                            ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
- 
--/* 64-bit source, 16/32/64 destination */
-+/* 64-bit source, 8/16/32/64 destination */
- 
--#define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
-+#define ACPI_MOVE_64_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];}
- 
--#define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
-+#define ACPI_MOVE_64_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];}
-+
-+#define ACPI_MOVE_64_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
-+                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[5];\
-+                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[4];}
- 
- #define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-                                          ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
-@@ -136,20 +145,26 @@
- 
- /* The hardware supports unaligned transfers, just do the little-endian move */
- 
--/* 16-bit source, 16/32/64 destination */
-+/* 16-bit source, 8/16/32/64 destination */
- 
-+#define ACPI_MOVE_16_TO_8(d, s)         *(UINT8 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_16(d, s)        *(UINT16 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT16 *)(void *)(s)
- 
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_32_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];}
-+
-+#define ACPI_MOVE_32_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
- 
--#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- #define ACPI_MOVE_32_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
- #define ACPI_MOVE_32_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
- 
--/* 64-bit source, 16/32/64 destination */
-+/* 64-bit source, 8/16/32/64 destination */
- 
-+#define ACPI_MOVE_64_TO_8(d, s)         ACPI_MOVE_16_TO_8(d, s)    /* Truncate to 8 */
- #define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- #define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
- #define ACPI_MOVE_64_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT64 *)(void *)(s)
-@@ -169,7 +184,9 @@
- #define ACPI_MOVE_16_TO_32(d, s)        {(*(UINT32 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
- #define ACPI_MOVE_16_TO_64(d, s)        {(*(UINT64 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
- 
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_32_TO_8(d, s)         ACPI_MOVE_16_TO_8(d, s)    /* Truncate to 8 */
- 
- #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- 
-Index: acpica-unix-20190405/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix-20190405.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190405/source/include/platform/aclinux.h
-@@ -198,6 +198,7 @@
- 
- #ifdef ACPI_USE_STANDARD_HEADERS
- #include <unistd.h>
-+#include <endian.h>
- #endif
- 
- /* Define/disable kernel-specific declarators */
-@@ -232,6 +233,10 @@
- #define __cdecl
- #endif
- 
-+#if defined(__PPC64__) || defined(__s390x__)
-+#define ACPI_BIG_ENDIAN
-+#endif
-+
- #endif /* __KERNEL__ */
- 
- #endif /* __ACLINUX_H__ */
-Index: acpica-unix-20190405/source/compiler/aslanalyze.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20190405/source/compiler/aslanalyze.c
-@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
- 
-     /* Need a null-terminated string version of NameSeg */
- 
--    ACPI_MOVE_32_TO_32 (Name, &Op->Asl.NameSeg);
-+    ACPI_COPY_NAMESEG (Name, &Op->Asl.NameSeg);
-     Name[ACPI_NAMESEG_SIZE] = 0;
- 
-     /*
-@@ -488,7 +488,7 @@ ApCheckForGpeNameConflict (
-      * We are now sure we have an _Lxx or _Exx.
-      * Create the target name that would cause collision (Flip E/L)
-      */
--    ACPI_MOVE_32_TO_32 (Target, Name);
-+    ACPI_COPY_NAMESEG (Target, Name);
- 
-     /* Inject opposite letter ("L" versus "E") */
- 
-Index: acpica-unix-20190405/source/compiler/asllookup.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/asllookup.c
-+++ acpica-unix-20190405/source/compiler/asllookup.c
-@@ -119,6 +119,7 @@ LkIsObjectUsed (
- {
-     ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
-     ACPI_NAMESPACE_NODE     *Next;
-+    ACPI_NAME_UNION         tmp, tmp2;
-     ASL_METHOD_LOCAL        *MethodLocals;
-     ASL_METHOD_LOCAL        *MethodArgs;
-     UINT32                  i;
-@@ -175,7 +176,8 @@ LkIsObjectUsed (
-                  * We ignore the predefined methods since often, not
-                  * all arguments are needed or used.
-                  */
--                if ((Node->Name.Ascii[0] != '_') &&
-+                ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii);
-+                if ((tmp.Ascii[0] != '_') &&
-                     (!(MethodArgs[i].Flags & ASL_ARG_REFERENCED)))
-                 {
-                     sprintf (AslGbl_MsgBuffer, "Arg%u", i);
-@@ -228,8 +230,10 @@ LkIsObjectUsed (
-              * Issue a remark even if it is a reserved name (starts
-              * with an underscore).
-              */
-+            ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii);
-+            ACPI_MOVE_32_TO_32(&tmp2.Ascii, Next->Name.Ascii);
-             sprintf (AslGbl_MsgBuffer, "Name [%4.4s] is within a method [%4.4s]",
--                Node->Name.Ascii, Next->Name.Ascii);
-+                tmp.Ascii, tmp2.Ascii);
-             AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
-                 LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
-             return (AE_OK);
-Index: acpica-unix-20190405/source/compiler/aslmain.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslmain.c
-+++ acpica-unix-20190405/source/compiler/aslmain.c
-@@ -101,18 +101,6 @@ main (
- 
-     signal (SIGINT, AslSignalHandler);
- 
--    /*
--     * Big-endian machines are not currently supported. ACPI tables must
--     * be little-endian, and support for big-endian machines needs to
--     * be implemented.
--     */
--    if (UtIsBigEndianMachine ())
--    {
--        fprintf (stderr,
--            "iASL is not currently supported on big-endian machines.\n");
--        return (-1);
--    }
--
-     AcpiOsInitialize ();
-     ACPI_DEBUG_INITIALIZE (); /* For debug version only */
- 
-Index: acpica-unix-20190405/source/common/acfileio.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/acfileio.c
-+++ acpica-unix-20190405/source/common/acfileio.c
-@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
-     ACPI_TABLE_HEADER       *Table;
-     INT32                   Count;
-     long                    TableOffset;
-+    UINT32		    TableLen;
- 
- 
-     *ReturnTable = NULL;
-@@ -319,7 +320,8 @@ AcGetOneTableFromFile (
- 
-     /* Allocate a buffer for the entire table */
- 
--    Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
-+    ACPI_MOVE_32_TO_32(&TableLen, &TableHeader.Length);
-+    Table = AcpiOsAllocate ((ACPI_SIZE) TableLen);
-     if (!Table)
-     {
-         return (AE_NO_MEMORY);
-@@ -329,13 +331,13 @@ AcGetOneTableFromFile (
- 
-     fseek (File, TableOffset, SEEK_SET);
- 
--    Count = fread (Table, 1, TableHeader.Length, File);
-+    Count = fread (Table, 1, TableLen, File);
- 
-     /*
-      * Checks for data table headers happen later in the execution. Only verify
-      * for Aml tables at this point in the code.
-      */
--    if (GetOnlyAmlTables && Count != (INT32) TableHeader.Length)
-+    if (GetOnlyAmlTables && Count != TableLen)
-     {
-         Status = AE_ERROR;
-         goto ErrorExit;
-@@ -343,7 +345,7 @@ AcGetOneTableFromFile (
- 
-     /* Validate the checksum (just issue a warning) */
- 
--    Status = AcpiTbVerifyChecksum (Table, TableHeader.Length);
-+    Status = AcpiTbVerifyChecksum (Table, TableLen);
-     if (ACPI_FAILURE (Status))
-     {
-         Status = AcCheckTextModeCorruption (Table);
-@@ -435,6 +437,7 @@ AcValidateTableHeader (
-     ACPI_SIZE               Actual;
-     long                    OriginalOffset;
-     UINT32                  FileSize;
-+    UINT32                  TableLength;
-     UINT32                  i;
- 
- 
-@@ -464,11 +467,12 @@ AcValidateTableHeader (
-     /* Validate table length against bytes remaining in the file */
- 
-     FileSize = CmGetFileSize (File);
--    if (TableHeader.Length > (UINT32) (FileSize - TableOffset))
-+    ACPI_MOVE_32_TO_32(&TableLength, &TableHeader.Length);
-+    if (TableLength > (UINT32) (FileSize - TableOffset))
-     {
-         fprintf (stderr, "Table [%4.4s] is too long for file - "
-             "needs: 0x%.2X, remaining in file: 0x%.2X\n",
--            TableHeader.Signature, TableHeader.Length,
-+            TableHeader.Signature, TableLength,
-             (UINT32) (FileSize - TableOffset));
-         return (AE_BAD_HEADER);
-     }
-Index: acpica-unix-20190405/source/common/dmtable.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/dmtable.c
-+++ acpica-unix-20190405/source/common/dmtable.c
-@@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
-      */
-     if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
-     {
--        Length = Table->Length;
-+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -565,13 +565,14 @@ AcpiDmDumpDataTable (
-     else if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_S3PT))
-     {
-         Length = AcpiDmDumpS3pt (Table);
-+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     }
-     else
-     {
-         /*
-          * All other tables must use the common ACPI table header, dump it now
-          */
--        Length = Table->Length;
-+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -782,6 +783,7 @@ AcpiDmDumpTable (
-     BOOLEAN                 LastOutputBlankLine = FALSE;
-     ACPI_STATUS             Status;
-     char                    RepairedName[8];
-+    UINT16		    Val16;
- 
- 
-     if (!Info)
-@@ -1178,8 +1180,9 @@ AcpiDmDumpTable (
-             /* Checksum, display and validate */
- 
-             AcpiOsPrintf ("%2.2X", *Target);
--            Temp8 = AcpiDmGenerateChecksum (Table,
--                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
-+	    ACPI_MOVE_32_TO_32(&Temp32,
-+			&ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length);
-+            Temp8 = AcpiDmGenerateChecksum (Table, Temp32,
-                 ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
- 
-             if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-@@ -1244,14 +1247,14 @@ AcpiDmDumpTable (
- 
-             /* DMAR subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Val16 = ACPI_GET16 (Target);
-+	    ACPI_MOVE_16_TO_16(&Temp16, &Val16);
-             if (Temp16 > ACPI_DMAR_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_DMAR_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
--                AcpiDmDmarSubnames[Temp16]);
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmDmarSubnames[Temp16]);
-             break;
- 
-         case ACPI_DMT_DMAR_SCOPE:
-@@ -1342,14 +1345,14 @@ AcpiDmDumpTable (
- 
-             /* HEST subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Val16 = ACPI_GET16 (Target);
-+	    ACPI_MOVE_16_TO_16(&Temp16, &Val16);
-             if (Temp16 > ACPI_HEST_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_HEST_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
--                AcpiDmHestSubnames[Temp16]);
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmHestSubnames[Temp16]);
-             break;
- 
-         case ACPI_DMT_HESTNTFY:
-@@ -1429,13 +1432,14 @@ AcpiDmDumpTable (
- 
-             /* NFIT subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Val16 = ACPI_GET16 (Target);
-+            ACPI_MOVE_16_TO_16(&Temp16, &Val16);
-             if (Temp16 > ACPI_NFIT_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_NFIT_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16,
-                 AcpiDmNfitSubnames[Temp16]);
-             break;
- 
-Index: acpica-unix-20190405/source/common/dmtables.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/dmtables.c
-+++ acpica-unix-20190405/source/common/dmtables.c
-@@ -142,7 +142,9 @@ AdCreateTableHeader (
-     ACPI_TABLE_HEADER       *Table)
- {
-     UINT8                   Checksum;
--
-+    UINT32		    TableLen;
-+    UINT32		    OemRev;
-+    UINT32		    CompilerRev;
- 
-     /* Reset globals for External statements */
- 
-@@ -154,9 +156,10 @@ AdCreateTableHeader (
-      */
-     AdDisassemblerHeader (Filename, ACPI_IS_AML_TABLE);
- 
-+    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
-     AcpiOsPrintf (" * Original Table Header:\n");
-     AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);
--    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", Table->Length, Table->Length);
-+    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", TableLen, TableLen);
- 
-     /* Print and validate the revision */
- 
-@@ -188,7 +191,7 @@ AdCreateTableHeader (
- 
-     AcpiOsPrintf ("\n *     Checksum         0x%2.2X",        Table->Checksum);
- 
--    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
-+    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), TableLen);
-     if (Checksum)
-     {
-         AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
-@@ -198,9 +201,11 @@ AdCreateTableHeader (
-     AcpiOsPrintf ("\n");
-     AcpiOsPrintf (" *     OEM ID           \"%.6s\"\n",     Table->OemId);
-     AcpiOsPrintf (" *     OEM Table ID     \"%.8s\"\n",     Table->OemTableId);
--    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);
-+    ACPI_MOVE_32_TO_32(&OemRev, &Table->OemRevision);
-+    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", OemRev, OemRev);
-     AcpiOsPrintf (" *     Compiler ID      \"%.4s\"\n",     Table->AslCompilerId);
--    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);
-+    ACPI_MOVE_32_TO_32(&CompilerRev, &Table->AslCompilerRevision);
-+    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", CompilerRev, CompilerRev);
-     AcpiOsPrintf (" */\n");
- 
-     /*
-@@ -221,7 +226,7 @@ AdCreateTableHeader (
-     AcpiOsPrintf (
-         "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-         Table->Signature, Table->Revision,
--        Table->OemId, Table->OemTableId, Table->OemRevision);
-+        Table->OemId, Table->OemTableId, OemRev);
- }
- 
- 
-@@ -396,7 +401,8 @@ AdParseTable (
- 
-     fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
- 
--    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);
-+    AmlLength -= sizeof (ACPI_TABLE_HEADER);
-     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
-     ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
- 
-Index: acpica-unix-20190405/source/common/dmtbdump.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump.c
-+++ acpica-unix-20190405/source/common/dmtbdump.c
-@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32		    Length;
-+    UINT32		    Address;
- 
- 
-     /* Point to start of table pointer array */
-@@ -286,12 +288,14 @@ AcpiDmDumpRsdt (
- 
-     /* RSDT uses 32-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X\n", Array[i]);
-+	ACPI_MOVE_32_TO_32(&Address, &Array[i]);
-+        AcpiOsPrintf ("%8.8X\n", Address);
-         Offset += sizeof (UINT32);
-     }
- }
-@@ -317,6 +321,8 @@ AcpiDmDumpXsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32                  Length;
-+    UINT64		    Address;
- 
- 
-     /* Point to start of table pointer array */
-@@ -326,12 +332,14 @@ AcpiDmDumpXsdt (
- 
-     /* XSDT uses 64-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
-+	ACPI_MOVE_64_TO_64(&Address, &Array[i]);
-+        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Address));
-         Offset += sizeof (UINT64);
-     }
- }
-@@ -358,12 +366,12 @@ AcpiDmDumpFadt (
-     ACPI_TABLE_HEADER       *Table)
- {
-     ACPI_STATUS             Status;
--
-+    UINT32		    Length;
- 
-     /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--        AcpiDmTableInfoFadt1);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt1);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -371,11 +379,9 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
- 
--    if ((Table->Length > ACPI_FADT_V1_SIZE) &&
--        (Table->Length <= ACPI_FADT_V2_SIZE))
-+    if ((Length > ACPI_FADT_V1_SIZE) && (Length <= ACPI_FADT_V2_SIZE))
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--            AcpiDmTableInfoFadt2);
-+        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt2);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -384,10 +390,9 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
- 
--    else if (Table->Length > ACPI_FADT_V2_SIZE)
-+    else if (Length > ACPI_FADT_V2_SIZE)
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--            AcpiDmTableInfoFadt3);
-+        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt3);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -395,9 +400,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (Length > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (Length, 0, Table, 0,
-                 AcpiDmTableInfoFadt5);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -407,9 +412,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (Length > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (Length, 0, Table, 0,
-                 AcpiDmTableInfoFadt6);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -420,11 +425,11 @@ AcpiDmDumpFadt (
- 
-     /* Validate various fields in the FADT, including length */
- 
--    AcpiTbCreateLocalFadt (Table, Table->Length);
-+    AcpiTbCreateLocalFadt (Table, Length);
- 
-     /* Validate FADT length against the revision */
- 
--    AcpiDmValidateFadtLength (Table->Revision, Table->Length);
-+    AcpiDmValidateFadtLength (Table->Revision, Length);
- }
- 
- 
-@@ -450,6 +455,7 @@ AcpiDmValidateFadtLength (
-     UINT32                  Length)
- {
-     UINT32                  ExpectedLength;
-+    UINT32		    Tmp32;
- 
- 
-     switch (Revision)
-@@ -485,7 +491,8 @@ AcpiDmValidateFadtLength (
-         return;
-     }
- 
--    if (Length == ExpectedLength)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Length);
-+    if (Tmp32 == ExpectedLength)
-     {
-         return;
-     }
-@@ -493,5 +500,5 @@ AcpiDmValidateFadtLength (
-     AcpiOsPrintf (
-         "\n// ACPI Warning: FADT revision %X does not match length: "
-         "found %X expected %X\n",
--        Revision, Length, ExpectedLength);
-+        Revision, Tmp32, ExpectedLength);
- }
-Index: acpica-unix-20190405/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump1.c
-+++ acpica-unix-20190405/source/common/dmtbdump1.c
-@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
-     UINT32                  DataOffset = 0;
-     UINT32                  i;
-     UINT8                   Type;
-+    UINT32		    Len;
-+    UINT16		    SubLen;
- 
- 
-     /* No main table, only subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Len)
-     {
-         /* Common subtable header */
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
-+	ACPI_MOVE_16_TO_16(&SubLen, &Subtable->Header.Length);
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable,
-+            SubLen, AcpiDmTableInfoAsfHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -146,8 +150,7 @@ AcpiDmDumpAsf (
-             return;
-         }
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Header.Length, InfoTable);
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable, SubLen, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -163,7 +166,7 @@ AcpiDmDumpAsf (
-             for (i = 0; i < DataCount; i++)
-             {
-                 AcpiOsPrintf ("\n");
--                Status = AcpiDmDumpTable (Table->Length, DataOffset,
-+                Status = AcpiDmDumpTable (Len, DataOffset,
-                     DataTable, DataLength, DataInfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -209,15 +212,14 @@ AcpiDmDumpAsf (
- 
-         /* Point to next subtable */
- 
--        if (!Subtable->Header.Length)
-+        if (!SubLen)
-         {
-             AcpiOsPrintf ("Invalid zero subtable header length\n");
-             return;
-         }
- 
--        Offset += Subtable->Header.Length;
--        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable,
--            Subtable->Header.Length);
-+        Offset += SubLen;
-+        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable, SubLen);
-     }
- }
- 
-@@ -241,12 +243,13 @@ AcpiDmDumpCpep (
- {
-     ACPI_STATUS             Status;
-     ACPI_CPEP_POLLING       *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -256,7 +259,7 @@ AcpiDmDumpCpep (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -296,7 +299,10 @@ AcpiDmDumpCsrt (
-     ACPI_CSRT_GROUP         *Subtable;
-     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
-     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT32                  SubLength;
-+    UINT32                  SubSubLength;
-+    UINT32                  SharedInfoLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
-     UINT32                  SubOffset;
-     UINT32                  SubSubOffset;
-@@ -307,14 +313,16 @@ AcpiDmDumpCsrt (
- 
-     /* Subtables (Resource Groups) */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Resource group subtable */
- 
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_32_TO_32(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoCsrt0);
-+            SubLength, AcpiDmTableInfoCsrt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -334,19 +342,20 @@ AcpiDmDumpCsrt (
-             return;
-         }
- 
--        SubOffset += Subtable->SharedInfoLength;
-+	ACPI_MOVE_32_TO_32(&SharedInfoLength, &Subtable->SharedInfoLength);
-+        SubOffset += SharedInfoLength;
- 
-         /* Sub-Subtables (Resource Descriptors) */
- 
-         SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
-             Offset + SubOffset);
- 
--        while ((SubOffset < Subtable->Length) &&
--              ((Offset + SubOffset) < Table->Length))
-+        while ((SubOffset < SubLength) && ((Offset + SubOffset) < Length))
-         {
-             AcpiOsPrintf ("\n");
-+	    ACPI_MOVE_32_TO_32(&SubSubLength, &SubSubtable->Length);
-             Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
--                SubSubtable->Length, AcpiDmTableInfoCsrt2);
-+                SubSubLength, AcpiDmTableInfoCsrt2);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -356,7 +365,7 @@ AcpiDmDumpCsrt (
- 
-             /* Resource-specific info buffer */
- 
--            InfoLength = SubSubtable->Length - SubSubOffset;
-+            InfoLength = SubSubLength - SubSubOffset;
-             if (InfoLength)
-             {
-                 Status = AcpiDmDumpTable (Length,
-@@ -371,16 +380,15 @@ AcpiDmDumpCsrt (
- 
-             /* Point to next sub-subtable */
- 
--            SubOffset += SubSubtable->Length;
-+            SubOffset += SubSubLength;
-             SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
--                SubSubtable->Length);
-+                SubSubLength);
-         }
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
--            Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable, SubLength);
-     }
- }
- 
-@@ -404,16 +412,20 @@ AcpiDmDumpDbg2 (
- {
-     ACPI_STATUS             Status;
-     ACPI_DBG2_DEVICE        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);
-     UINT32                  i;
-     UINT32                  ArrayOffset;
-     UINT32                  AbsoluteOffset;
-     UINT8                   *Array;
-+    UINT16		    Tmp16;
-+    UINT16		    AlsoTmp16;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -423,11 +435,12 @@ AcpiDmDumpDbg2 (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDbg2Device);
-+            SubLength, AcpiDmTableInfoDbg2Device);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -437,13 +450,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->BaseAddressOffset +
--                (sizeof (ACPI_GENERIC_ADDRESS) * i);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->BaseAddressOffset);
-+            ArrayOffset = Tmp16 + (sizeof (ACPI_GENERIC_ADDRESS) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Addr);
-+                SubLength, AcpiDmTableInfoDbg2Addr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -454,13 +467,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->AddressSizeOffset +
--                (sizeof (UINT32) * i);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->AddressSizeOffset);
-+            ArrayOffset = Tmp16 + (sizeof (UINT32) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Size);
-+                SubLength, AcpiDmTableInfoDbg2Size);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -470,12 +483,13 @@ AcpiDmDumpDbg2 (
-         /* Dump the Namestring (required) */
- 
-         AcpiOsPrintf ("\n");
--        ArrayOffset = Subtable->NamepathOffset;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->NamepathOffset);
-+        ArrayOffset = Tmp16;
-         AbsoluteOffset = Offset + ArrayOffset;
-         Array = (UINT8 *) Subtable + ArrayOffset;
- 
-         Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--            Subtable->Length, AcpiDmTableInfoDbg2Name);
-+            SubLength, AcpiDmTableInfoDbg2Name);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -485,9 +499,10 @@ AcpiDmDumpDbg2 (
- 
-         if (Subtable->OemDataOffset)
-         {
--            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
--                Table, Subtable->OemDataLength,
--                AcpiDmTableInfoDbg2OemData);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->OemDataOffset);
-+	    ACPI_MOVE_16_TO_16(&AlsoTmp16, &Subtable->OemDataLength);
-+            Status = AcpiDmDumpTable (Length, Offset + Tmp16,
-+                Table, AlsoTmp16, AcpiDmTableInfoDbg2OemData);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -496,9 +511,9 @@ AcpiDmDumpDbg2 (
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubLength;
-         Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
--            Subtable->Length);
-+            SubLength);
-     }
- }
- 
-@@ -522,17 +537,20 @@ AcpiDmDumpDmar (
- {
-     ACPI_STATUS             Status;
-     ACPI_DMAR_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;
-     UINT32                  ScopeOffset;
-     UINT8                   *PciPath;
-     UINT32                  PathOffset;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -542,13 +560,14 @@ AcpiDmDumpDmar (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDmarHdr);
-+            SubLength, AcpiDmTableInfoDmarHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -556,7 +575,8 @@ AcpiDmDumpDmar (
- 
-         AcpiOsPrintf ("\n");
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
- 
-@@ -591,12 +611,12 @@ AcpiDmDumpDmar (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
--                Subtable->Type);
-+                SubType);
-             return;
-         }
- 
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -605,8 +625,8 @@ AcpiDmDumpDmar (
-         /*
-          * Dump the optional device scope entries
-          */
--        if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
--            (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+        if ((SubType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+            (SubType == ACPI_DMAR_TYPE_NAMESPACE))
-         {
-             /* These types do not support device scopes */
- 
-@@ -614,7 +634,7 @@ AcpiDmDumpDmar (
-         }
- 
-         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
--        while (ScopeOffset < Subtable->Length)
-+        while (ScopeOffset < SubLength)
-         {
-             AcpiOsPrintf ("\n");
-             Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -655,9 +675,8 @@ AcpiDmDumpDmar (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
--            Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -684,12 +703,15 @@ AcpiDmDumpDrtm (
-     ACPI_DRTM_RESOURCE_LIST *DrtmRl;
-     ACPI_DRTM_DPS_ID        *DrtmDps;
-     UINT32                  Count;
-+    UINT32                  ValidatedCount;
-+    UINT32                  ResourceCount;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--        AcpiDmTableInfoDrtm);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDrtm);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -703,7 +725,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (Length, Offset,
-         DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
-         AcpiDmTableInfoDrtm0);
-     if (ACPI_FAILURE (Status))
-@@ -716,10 +738,11 @@ AcpiDmDumpDrtm (
-     /* Dump Validated table addresses */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--            (DrtmVtl->ValidatedTableCount > Count))
-+    ACPI_MOVE_32_TO_32(&ValidatedCount, &DrtmVtl->ValidatedTableCount);
-+    while ((Offset < Length) &&
-+            (ValidatedCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (Length, Offset,
-             ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
-             AcpiDmTableInfoDrtm0a);
-         if (ACPI_FAILURE (Status))
-@@ -735,7 +758,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (Length, Offset,
-         DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
-         AcpiDmTableInfoDrtm1);
-     if (ACPI_FAILURE (Status))
-@@ -748,10 +771,11 @@ AcpiDmDumpDrtm (
-     /* Dump the Resource List */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--           (DrtmRl->ResourceCount > Count))
-+    ACPI_MOVE_32_TO_32(&ResourceCount, &DrtmRl->ResourceCount);
-+    while ((Offset < Length) &&
-+           (ResourceCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (Length, Offset,
-             ACPI_ADD_PTR (void, Table, Offset),
-             sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
-         if (ACPI_FAILURE (Status))
-@@ -767,7 +791,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
-     AcpiOsPrintf ("\n");
--    (void) AcpiDmDumpTable (Table->Length, Offset,
-+    (void) AcpiDmDumpTable (Length, Offset,
-         DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
- }
- 
-@@ -791,12 +815,13 @@ AcpiDmDumpEinj (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -806,7 +831,7 @@ AcpiDmDumpEinj (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -844,12 +869,13 @@ AcpiDmDumpErst (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -859,7 +885,7 @@ AcpiDmDumpErst (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -897,17 +923,19 @@ AcpiDmDumpFpdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_FPDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT16		    Type;
- 
- 
-     /* There is no main table (other than the standard ACPI header) */
- 
-     /* Subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -919,7 +947,8 @@ AcpiDmDumpFpdt (
-             return;
-         }
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&Type, &Subtable->Type);
-+        switch (Type)
-         {
-         case ACPI_FPDT_TYPE_BOOT:
- 
-@@ -933,8 +962,7 @@ AcpiDmDumpFpdt (
- 
-         default:
- 
--            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n",
--                Subtable->Type);
-+            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n", Type);
- 
-             /* Attempt to continue */
- 
-@@ -982,16 +1010,19 @@ AcpiDmDumpGtdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_GTDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-     UINT32                  GtCount;
-+    UINT32                  Tmp32;
-     ACPI_GTDT_TIMER_ENTRY   *GtxTable;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1018,7 +1049,7 @@ AcpiDmDumpGtdt (
- 
-     /* Subtables */
- 
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -1036,8 +1067,9 @@ AcpiDmDumpGtdt (
-         case ACPI_GTDT_TYPE_TIMER_BLOCK:
- 
-             SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
--            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+            Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-                 Subtable))->TimerCount;
-+	    ACPI_MOVE_32_TO_32(&GtCount, &Tmp32);
- 
-             InfoTable = AcpiDmTableInfoGtdt0;
-             break;
-@@ -1058,8 +1090,9 @@ AcpiDmDumpGtdt (
-             return;
-         }
- 
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1118,16 +1151,18 @@ AcpiDmDumpHest (
- {
-     ACPI_STATUS             Status;
-     ACPI_HEST_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_HEST);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-     UINT32                  BankCount;
-     ACPI_HEST_IA_ERROR_BANK *BankTable;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHest);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1137,10 +1172,11 @@ AcpiDmDumpHest (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         BankCount = 0;
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_HEST_TYPE_IA32_CHECK:
- 
-Index: acpica-unix-20190405/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20190405/source/common/dmtbdump2.c
-@@ -75,15 +75,21 @@ AcpiDmDumpIort (
-     ACPI_IORT_SMMU          *IortSmmu = NULL;
-     UINT32                  Offset;
-     UINT32                  NodeOffset;
-+    UINT16		    NodeLength;
-     UINT32                  Length;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     char                    *String;
-     UINT32                  i;
--
-+    UINT32		    TableLen;
-+    UINT32		    ItsCount;
-+    UINT32		    MappingCount;
-+    UINT32		    CtxIntCount;
-+    UINT32		    PmuIntCount;
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
-+    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
-+    Status = AcpiDmDumpTable (TableLen, 0, Table, 0, AcpiDmTableInfoIort);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -94,18 +100,19 @@ AcpiDmDumpIort (
- 
-     /* Dump the OptionalPadding (optional) */
- 
--    if (Iort->NodeOffset > Offset)
-+    ACPI_MOVE_32_TO_32(&NodeOffset, &Iort->NodeOffset);
-+    if (NodeOffset > Offset)
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset, Table,
--            Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
-+        Status = AcpiDmDumpTable (TableLen, Offset, Table,
-+            NodeOffset - Offset, AcpiDmTableInfoIortPad);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
-     }
- 
--    Offset = Iort->NodeOffset;
--    while (Offset < Table->Length)
-+    ACPI_MOVE_32_TO_32(&Offset, &Iort->NodeOffset);
-+    while (Offset < TableLen)
-     {
-         /* Common subtable header */
- 
-@@ -141,7 +148,8 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
- 
-             InfoTable = AcpiDmTableInfoIort2;
--            Length = IortNode->Length - NodeOffset;
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            Length = NodeLength - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_SMMU:
-@@ -154,7 +162,8 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_SMMU_V3:
- 
-             InfoTable = AcpiDmTableInfoIort4;
--            Length = IortNode->Length - NodeOffset;
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            Length = NodeLength - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_PMCG:
-@@ -170,7 +179,8 @@ AcpiDmDumpIort (
- 
-             /* Attempt to continue */
- 
--            if (!IortNode->Length)
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            if (!NodeLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length IORT node\n");
-                 return;
-@@ -181,7 +191,7 @@ AcpiDmDumpIort (
-         /* Dump the node subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+        Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-             ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-             Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-@@ -201,9 +211,10 @@ AcpiDmDumpIort (
- 
-             if (IortItsGroup)
-             {
--                for (i = 0; i < IortItsGroup->ItsCount; i++)
-+	        ACPI_MOVE_32_TO_32(&ItsCount, &IortItsGroup->ItsCount);
-+                for (i = 0; i < ItsCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         4, AcpiDmTableInfoIort0a);
-                     NodeOffset += 4;
-@@ -215,11 +226,11 @@ AcpiDmDumpIort (
- 
-             /* Dump the Padding (optional) */
- 
--            if (IortNode->Length > NodeOffset)
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            if (NodeLength > NodeOffset)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
--                    Table, IortNode->Length - NodeOffset,
--                    AcpiDmTableInfoIort1a);
-+                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-+                    Table, NodeLength - NodeOffset, AcpiDmTableInfoIort1a);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -236,8 +247,8 @@ AcpiDmDumpIort (
-             if (IortSmmu)
-             {
-                 Length = 2 * sizeof (UINT64);
--                NodeOffset = IortSmmu->GlobalInterruptOffset;
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->GlobalInterruptOffset);
-+                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                     ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                     Length, AcpiDmTableInfoIort3a);
-                 if (ACPI_FAILURE (Status))
-@@ -245,10 +256,11 @@ AcpiDmDumpIort (
-                     return;
-                 }
- 
--                NodeOffset = IortSmmu->ContextInterruptOffset;
--                for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->ContextInterruptOffset);
-+                ACPI_MOVE_32_TO_32(&CtxIntCount, &IortSmmu->ContextInterruptCount);
-+                for (i = 0; i < CtxIntCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3b);
-                     if (ACPI_FAILURE (Status))
-@@ -259,10 +271,11 @@ AcpiDmDumpIort (
-                     NodeOffset += 8;
-                 }
- 
--                NodeOffset = IortSmmu->PmuInterruptOffset;
--                for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->PmuInterruptOffset);
-+                ACPI_MOVE_32_TO_32(&PmuIntCount, &IortSmmu->PmuInterruptCount);
-+                for (i = 0; i < PmuIntCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3c);
-                     if (ACPI_FAILURE (Status))
-@@ -282,12 +295,13 @@ AcpiDmDumpIort (
- 
-         /* Dump the ID mappings */
- 
--        NodeOffset = IortNode->MappingOffset;
--        for (i = 0; i < IortNode->MappingCount; i++)
-+        ACPI_MOVE_32_TO_32(&NodeOffset, &IortNode->MappingOffset);
-+        ACPI_MOVE_32_TO_32(&MappingCount, &IortNode->MappingCount);
-+        for (i = 0; i < MappingCount; i++)
-         {
-             AcpiOsPrintf ("\n");
-             Length = sizeof (ACPI_IORT_ID_MAPPING);
--            Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+            Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                 Length, AcpiDmTableInfoIortMap);
-             if (ACPI_FAILURE (Status))
-@@ -301,8 +315,9 @@ AcpiDmDumpIort (
- NextSubtable:
-         /* Point to next node subtable */
- 
--        Offset += IortNode->Length;
--        IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, IortNode->Length);
-+	ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+        Offset += NodeLength;
-+        IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeLength);
-     }
- }
- 
-@@ -333,11 +348,14 @@ AcpiDmDumpIvrs (
-     ACPI_IVRS_DE_HEADER     *DeviceEntry;
-     ACPI_IVRS_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32		    Length;
-+    UINT16		    SubLength;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -346,13 +364,14 @@ AcpiDmDumpIvrs (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoIvrsHdr);
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            SubLength, AcpiDmTableInfoIvrsHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -379,7 +398,7 @@ AcpiDmDumpIvrs (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -390,8 +409,8 @@ AcpiDmDumpIvrs (
-         /* Dump the subtable */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -405,7 +424,7 @@ AcpiDmDumpIvrs (
-             DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
-                 sizeof (ACPI_IVRS_HARDWARE));
- 
--            while (EntryOffset < (Offset + Subtable->Length))
-+            while (EntryOffset < (Offset + SubLength))
-             {
-                 AcpiOsPrintf ("\n");
-                 /*
-@@ -467,7 +486,7 @@ AcpiDmDumpIvrs (
- 
-                 /* Dump the Device Entry */
- 
--                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                Status = AcpiDmDumpTable (Length, EntryOffset,
-                     DeviceEntry, EntryLength, InfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -483,8 +502,8 @@ AcpiDmDumpIvrs (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -510,7 +529,7 @@ AcpiDmDumpLpit (
- {
-     ACPI_STATUS             Status;
-     ACPI_LPIT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-@@ -518,8 +537,9 @@ AcpiDmDumpLpit (
- 
-     /* Subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -583,13 +603,14 @@ AcpiDmDumpMadt (
- {
-     ACPI_STATUS             Status;
-     ACPI_SUBTABLE_HEADER    *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
-     ACPI_DMTABLE_INFO       *InfoTable;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -599,7 +620,7 @@ AcpiDmDumpMadt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -745,11 +766,13 @@ AcpiDmDumpMcfg (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
-     ACPI_MCFG_ALLOCATION    *Subtable;
-+    UINT32		    Len;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
-+    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
-+    Status = AcpiDmDumpTable (Len, 0, Table, 0, AcpiDmTableInfoMcfg);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -758,17 +781,17 @@ AcpiDmDumpMcfg (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Len)
-     {
--        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
-+        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Len)
-         {
-             AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
--                sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
-+                sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
-             return;
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable,
-             sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -802,6 +825,7 @@ AcpiDmDumpMpst (
- {
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
-+    ACPI_TABLE_MPST	    *Mpst;
-     ACPI_MPST_POWER_NODE    *Subtable0;
-     ACPI_MPST_POWER_STATE   *Subtable0A;
-     ACPI_MPST_COMPONENT     *Subtable0B;
-@@ -810,11 +834,13 @@ AcpiDmDumpMpst (
-     UINT16                  SubtableCount;
-     UINT32                  PowerStateCount;
-     UINT32                  ComponentCount;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMpst);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -822,13 +848,14 @@ AcpiDmDumpMpst (
- 
-     /* Subtable: Memory Power Node(s) */
- 
--    SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+    Mpst = ACPI_CAST_PTR (ACPI_TABLE_MPST, Table);
-+    ACPI_MOVE_16_TO_16(&SubtableCount, &Mpst->PowerNodeCount);
-     Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < Length) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -837,8 +864,8 @@ AcpiDmDumpMpst (
- 
-         /* Extract the sub-subtable counts */
- 
--        PowerStateCount = Subtable0->NumPowerStates;
--        ComponentCount = Subtable0->NumPhysicalComponents;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
-         Offset += sizeof (ACPI_MPST_POWER_NODE);
- 
-         /* Sub-subtables - Memory Power State Structure(s) */
-@@ -849,7 +876,7 @@ AcpiDmDumpMpst (
-         while (PowerStateCount)
-         {
-             AcpiOsPrintf ("\n");
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
-+            Status = AcpiDmDumpTable (Length, Offset, Subtable0A,
-                 sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -859,7 +886,7 @@ AcpiDmDumpMpst (
-             Subtable0A++;
-             PowerStateCount--;
-             Offset += sizeof (ACPI_MPST_POWER_STATE);
--       }
-+        }
- 
-         /* Sub-subtables - Physical Component ID Structure(s) */
- 
-@@ -872,7 +899,7 @@ AcpiDmDumpMpst (
- 
-         while (ComponentCount)
-         {
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
-+            Status = AcpiDmDumpTable (Length, Offset, Subtable0B,
-                 sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -887,17 +914,19 @@ AcpiDmDumpMpst (
-         /* Point to next Memory Power Node subtable */
- 
-         SubtableCount--;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
-         Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE) +
--            (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
--            (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
-+            (sizeof (ACPI_MPST_POWER_STATE) * PowerStateCount) +
-+            (sizeof (ACPI_MPST_COMPONENT) * ComponentCount));
-     }
- 
-     /* Subtable: Count of Memory Power State Characteristic structures */
- 
-     AcpiOsPrintf ("\n");
-     Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
--    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
-+    Status = AcpiDmDumpTable (Length, Offset, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -912,10 +941,10 @@ AcpiDmDumpMpst (
-     Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR));
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < Length) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable2,
-             sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -948,11 +977,13 @@ AcpiDmDumpMsct (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
-     ACPI_MSCT_PROXIMITY     *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMsct);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -961,12 +992,12 @@ AcpiDmDumpMsct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1001,11 +1032,13 @@ AcpiDmDumpMtmr (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
-     ACPI_MTMR_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1014,12 +1047,12 @@ AcpiDmDumpMtmr (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1061,11 +1094,17 @@ AcpiDmDumpNfit (
-     ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
-     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-     UINT32                  i;
-+    UINT32                  TableLength;
-+    UINT16                  SubLength;
-+    UINT16                  SubType;
-+    UINT32                  Count;
-+    UINT16                  Count16;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
-+    ACPI_MOVE_32_TO_32(&TableLength, &Table->Length);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1074,19 +1113,21 @@ AcpiDmDumpNfit (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* NFIT subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoNfitHdr);
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubLength, AcpiDmTableInfoNfitHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
- 
-@@ -1143,7 +1184,7 @@ AcpiDmDumpNfit (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -1152,8 +1193,8 @@ AcpiDmDumpNfit (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1161,13 +1202,14 @@ AcpiDmDumpNfit (
- 
-         /* Per-subtable variable-length fields */
- 
--        switch (Subtable->Type)
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_INTERLEAVE:
- 
--            for (i = 0; i < Interleave->LineCount; i++)
-+	    ACPI_MOVE_32_TO_32(&Count, &Interleave->LineCount);
-+            for (i = 0; i < Count; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Interleave->LineOffset[i],
-                     sizeof (UINT32), AcpiDmTableInfoNfit2a);
-                 if (ACPI_FAILURE (Status))
-@@ -1181,12 +1223,11 @@ AcpiDmDumpNfit (
- 
-         case ACPI_NFIT_TYPE_SMBIOS:
- 
--            Length = Subtable->Length -
--                sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
-+            Length = SubLength - sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
- 
-             if (Length)
-             {
--                Status = AcpiDmDumpTable (Table->Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
-                     SmbiosInfo,
-                     Length, AcpiDmTableInfoNfit3a);
-@@ -1200,9 +1241,10 @@ AcpiDmDumpNfit (
- 
-         case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
- 
--            for (i = 0; i < Hint->HintCount; i++)
-+	    ACPI_MOVE_16_TO_16(&Count16, &Hint->HintCount);
-+            for (i = 0; i < Count16; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Hint->HintAddress[i],
-                     sizeof (UINT64), AcpiDmTableInfoNfit6a);
-                 if (ACPI_FAILURE (Status))
-@@ -1221,8 +1263,8 @@ AcpiDmDumpNfit (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -1247,12 +1289,13 @@ AcpiDmDumpPcct (
-     ACPI_STATUS             Status;
-     ACPI_PCCT_SUBSPACE      *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1262,7 +1305,7 @@ AcpiDmDumpPcct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -1402,16 +1445,21 @@ AcpiDmDumpPmtt (
-     ACPI_PMTT_HEADER        *MemSubtable;
-     ACPI_PMTT_HEADER        *DimmSubtable;
-     ACPI_PMTT_DOMAIN        *DomainArray;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
-     UINT32                  MemOffset;
-     UINT32                  DimmOffset;
-     UINT32                  DomainOffset;
--    UINT32                  DomainCount;
-+    UINT16                  DomainCount;
-+    UINT16		    SubLength;
-+    UINT16		    Tmp16;
-+    UINT16		    MemLength;
-+    UINT16		    DimmLength;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1421,13 +1469,14 @@ AcpiDmDumpPmtt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmttHdr);
-+            SubLength, AcpiDmTableInfoPmttHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1446,7 +1495,7 @@ AcpiDmDumpPmtt (
-         /* Dump the fixed-length portion of the subtable */
- 
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmtt0);
-+            SubLength, AcpiDmTableInfoPmtt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1458,15 +1507,16 @@ AcpiDmDumpPmtt (
-         MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
-             sizeof (ACPI_PMTT_SOCKET));
- 
--        while (((Offset + MemOffset) < Table->Length) &&
--            (MemOffset < Subtable->Length))
-+        while (((Offset + MemOffset) < Length) &&
-+            (MemOffset < SubLength))
-         {
-             /* Common subtable header */
- 
-             AcpiOsPrintf ("\n");
-+	    ACPI_MOVE_16_TO_16(&MemLength, &MemSubtable->Length);
-             Status = AcpiDmDumpTable (Length,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                MemLength, AcpiDmTableInfoPmttHdr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1486,7 +1536,7 @@ AcpiDmDumpPmtt (
- 
-             Status = AcpiDmDumpTable (Length,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmtt1);
-+                MemLength, AcpiDmTableInfoPmtt1);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1494,13 +1544,14 @@ AcpiDmDumpPmtt (
- 
-             /* Walk the variable count of proximity domains */
- 
--            DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+	    Tmp16 = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+            ACPI_MOVE_16_TO_16(&DomainCount, &Tmp16);
-             DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
-             DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubtable,
-                 sizeof (ACPI_PMTT_CONTROLLER));
- 
--            while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
--                ((MemOffset + DomainOffset) < Subtable->Length) &&
-+            while (((Offset + MemOffset + DomainOffset) < Length) &&
-+                ((MemOffset + DomainOffset) < SubLength) &&
-                 DomainCount)
-             {
-                 Status = AcpiDmDumpTable (Length,
-@@ -1528,15 +1579,16 @@ AcpiDmDumpPmtt (
-             DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
-                 DomainOffset);
- 
--            while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
--                (DimmOffset < MemSubtable->Length))
-+            while (((Offset + MemOffset + DimmOffset) < Length) &&
-+                (DimmOffset < MemLength))
-             {
-                 /* Common subtable header */
- 
-                 AcpiOsPrintf ("\n");
-+		ACPI_MOVE_16_TO_16(&DimmLength, &DimmSubtable->Length);
-                 Status = AcpiDmDumpTable (Length,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                    DimmLength, AcpiDmTableInfoPmttHdr);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1556,7 +1608,7 @@ AcpiDmDumpPmtt (
- 
-                 Status = AcpiDmDumpTable (Length,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmtt2);
-+                    DimmLength, AcpiDmTableInfoPmtt2);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1564,23 +1616,22 @@ AcpiDmDumpPmtt (
- 
-                 /* Point to next DIMM subtable */
- 
--                DimmOffset += DimmSubtable->Length;
-+                DimmOffset += DimmLength;
-                 DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                    DimmSubtable, DimmSubtable->Length);
-+                    DimmSubtable, DimmLength);
-             }
- 
-             /* Point to next Controller subtable */
- 
--            MemOffset += MemSubtable->Length;
-+            MemOffset += MemLength;
-             MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                MemSubtable, MemSubtable->Length);
-+                MemSubtable, MemLength);
-         }
- 
-         /* Point to next Socket subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--            Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -1736,6 +1787,8 @@ AcpiDmDumpS3pt (
-     ACPI_FPDT_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
-+    UINT32		    Length;
-+    UINT16                  SubType;
- 
- 
-     /* Main table */
-@@ -1746,20 +1799,22 @@ AcpiDmDumpS3pt (
-         return 0;
-     }
- 
-+    ACPI_MOVE_32_TO_32(&Length, &S3ptTable->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
--    while (Offset < S3ptTable->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoS3ptHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return 0;
-         }
- 
--        switch (Subtable->Type)
-+        ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_S3PT_TYPE_RESUME:
- 
-@@ -1774,7 +1829,7 @@ AcpiDmDumpS3pt (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
--                Subtable->Type);
-+                SubType);
- 
-             /* Attempt to continue */
- 
-@@ -1787,7 +1842,7 @@ AcpiDmDumpS3pt (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-Index: acpica-unix-20190405/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump3.c
-+++ acpica-unix-20190405/source/common/dmtbdump3.c
-@@ -68,9 +68,11 @@ void
- AcpiDmDumpSlic (
-     ACPI_TABLE_HEADER       *Table)
- {
-+    UINT32	Length;
- 
--    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
--        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    (void) AcpiDmDumpTable (Length, sizeof (ACPI_TABLE_HEADER), Table,
-+        Length - sizeof (*Table), AcpiDmTableInfoSlic);
- }
- 
- 
-@@ -93,14 +95,17 @@ AcpiDmDumpSlit (
-     ACPI_STATUS             Status;
-     UINT32                  Offset;
-     UINT8                   *Row;
--    UINT32                  Localities;
-+    UINT64                  Localities;
-     UINT32                  i;
-     UINT32                  j;
-+    UINT32		    Length;
-+    UINT64                  Tmp64;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSlit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -108,7 +113,8 @@ AcpiDmDumpSlit (
- 
-     /* Display the Locality NxN Matrix */
- 
--    Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    Tmp64 = (UINT64) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    ACPI_MOVE_64_TO_64(&Localities, &Tmp64);
-     Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
-     Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
- 
-@@ -121,7 +127,7 @@ AcpiDmDumpSlit (
-         {
-             /* Check for beyond EOT */
- 
--            if (Offset >= Table->Length)
-+            if (Offset >= Length)
-             {
-                 AcpiOsPrintf (
-                     "\n**** Not enough room in table for all localities\n");
-@@ -173,11 +179,13 @@ AcpiDmDumpSrat (
-     UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
-     ACPI_SUBTABLE_HEADER    *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSrat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -186,12 +194,12 @@ AcpiDmDumpSrat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoSratHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -245,7 +253,7 @@ AcpiDmDumpSrat (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -282,13 +290,14 @@ AcpiDmDumpStao (
- {
-     ACPI_STATUS             Status;
-     char                    *Namepath;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  StringLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_STAO);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -297,7 +306,7 @@ AcpiDmDumpStao (
- 
-     /* The rest of the table consists of Namepath strings */
- 
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         Namepath = ACPI_ADD_PTR (char, Table, Offset);
-         StringLength = strlen (Namepath) + 1;
-@@ -339,11 +348,14 @@ AcpiDmDumpTcpa (
-     ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
-                                 ACPI_TABLE_TCPA_HDR, Table, Offset);
-     ACPI_STATUS             Status;
-+    UINT32		    Length;
-+    UINT16		    PlatformClass;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table,
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table,
-         0, AcpiDmTableInfoTcpaHdr);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -354,18 +366,19 @@ AcpiDmDumpTcpa (
-      * Examine the PlatformClass field to determine the table type.
-      * Either a client or server table. Only one.
-      */
--    switch (CommonHeader->PlatformClass)
-+    ACPI_MOVE_16_TO_16(&PlatformClass, &CommonHeader->PlatformClass);
-+    switch (PlatformClass)
-     {
-     case ACPI_TCPA_CLIENT_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTcpaClient);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            Length - Offset, AcpiDmTableInfoTcpaClient);
-         break;
- 
-     case ACPI_TCPA_SERVER_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTcpaServer);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            Length - Offset, AcpiDmTableInfoTcpaServer);
-         break;
- 
-     default:
-@@ -512,11 +525,13 @@ AcpiDmDumpVrtc (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_VRTC);
-     ACPI_VRTC_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -525,12 +540,12 @@ AcpiDmDumpVrtc (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -565,11 +580,13 @@ AcpiDmDumpWdat (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
-     ACPI_WDAT_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWdat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -578,12 +595,12 @@ AcpiDmDumpWdat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -618,12 +635,13 @@ AcpiDmDumpWpbt (
- {
-     ACPI_STATUS             Status;
-     ACPI_TABLE_WPBT         *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT16                  ArgumentsLength;
- 
- 
-     /* Dump the main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -633,10 +651,10 @@ AcpiDmDumpWpbt (
-     /* Extract the arguments buffer length from the main table */
- 
-     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
--    ArgumentsLength = Subtable->ArgumentsLength;
-+    ACPI_MOVE_16_TO_16(&ArgumentsLength, &Subtable->ArgumentsLength);
- 
-     /* Dump the arguments buffer */
- 
--    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+    (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
-         AcpiDmTableInfoWpbt0);
- }
-Index: acpica-unix-20190405/source/compiler/dtfield.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/dtfield.c
-+++ acpica-unix-20190405/source/compiler/dtfield.c
-@@ -359,7 +359,27 @@ DtCompileInteger (
-         DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
-     }
- 
--    memcpy (Buffer, &Value, ByteLength);
-+    switch (ByteLength) {
-+    case 1:
-+	ACPI_MOVE_64_TO_8(Buffer, &Value);
-+	break;
-+
-+    case 2:
-+	ACPI_MOVE_64_TO_16(Buffer, &Value);
-+	break;
-+
-+    case 4:
-+	ACPI_MOVE_64_TO_32(Buffer, &Value);
-+	break;
-+
-+    case 8:
-+	ACPI_MOVE_64_TO_64(Buffer, &Value);
-+	break;
-+
-+    default:
-+	memcpy (Buffer, &Value, ByteLength);
-+	break;
-+    }
-     return;
- }
- 
-Index: acpica-unix-20190405/source/compiler/dtsubtable.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/dtsubtable.c
-+++ acpica-unix-20190405/source/compiler/dtsubtable.c
-@@ -378,6 +378,21 @@ DtSetSubtableLength (
-         return;
-     }
- 
--    memcpy (Subtable->LengthField, &Subtable->TotalLength,
--        Subtable->SizeOfLengthField);
-+    switch(Subtable->SizeOfLengthField) {
-+    case 1:
-+	ACPI_MOVE_32_TO_8(Subtable->LengthField, &Subtable->TotalLength);
-+	break;
-+
-+    case 2:
-+	ACPI_MOVE_32_TO_16(Subtable->LengthField, &Subtable->TotalLength);
-+	break;
-+
-+    case 4:
-+	ACPI_MOVE_32_TO_32(Subtable->LengthField, &Subtable->TotalLength);
-+	break;
-+
-+    default:
-+    	memcpy (Subtable->LengthField, &Subtable->TotalLength,
-+        	Subtable->SizeOfLengthField);
-+    }
- }
-Index: acpica-unix-20190405/source/compiler/dttable1.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/dttable1.c
-+++ acpica-unix-20190405/source/compiler/dttable1.c
-@@ -281,6 +281,8 @@ DtCompileCsrt (
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
-     UINT32                  DescriptorCount;
-     UINT32                  GroupLength;
-+    ACPI_CSRT_GROUP	    *Pgrp;
-+    UINT32		    Tmp32;
- 
- 
-     /* Subtables (Resource Groups) */
-@@ -299,12 +301,20 @@ DtCompileCsrt (
- 
-         /* Compute the number of resource descriptors */
- 
-+	/*
-         GroupLength =
-             (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-                 Subtable->Buffer))->Length -
-             (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-                 Subtable->Buffer))->SharedInfoLength -
-             sizeof (ACPI_CSRT_GROUP);
-+	*/
-+	Pgrp = ACPI_CAST_PTR(ACPI_CSRT_GROUP, Subtable->Buffer);
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Pgrp->Length);
-+	GroupLength = Tmp32;
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Pgrp->SharedInfoLength);
-+	GroupLength -= Tmp32;
-+        GroupLength -= sizeof (ACPI_CSRT_GROUP);
- 
-         DescriptorCount = (GroupLength  /
-             sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -392,6 +402,8 @@ DtCompileDbg2 (
-     ACPI_DBG2_DEVICE        *DeviceInfo;
-     UINT16                  CurrentOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     /* Main table */
-@@ -408,10 +420,11 @@ DtCompileDbg2 (
-     /* Main table fields */
- 
-     Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
--    Dbg2Header->InfoOffset = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-+    Tmp32 = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-         ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+    ACPI_MOVE_32_TO_32(&Dbg2Header->InfoOffset, &Tmp32);
- 
--    SubtableCount = Dbg2Header->InfoCount;
-+    ACPI_MOVE_32_TO_32(&SubtableCount, &Dbg2Header->InfoCount);
-     DtPushSubtable (Subtable);
- 
-     /* Process all Device Information subtables (Count = InfoCount) */
-@@ -438,7 +451,7 @@ DtCompileDbg2 (
- 
-         /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
- 
--        DeviceInfo->BaseAddressOffset = CurrentOffset;
-+        ACPI_MOVE_16_TO_16(&DeviceInfo->BaseAddressOffset, &CurrentOffset);
-         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -454,7 +467,7 @@ DtCompileDbg2 (
- 
-         /* AddressSize array (Required, size = RegisterCount) */
- 
--        DeviceInfo->AddressSizeOffset = CurrentOffset;
-+        ACPI_MOVE_16_TO_16(&DeviceInfo->AddressSizeOffset, &CurrentOffset);
-         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -470,7 +483,7 @@ DtCompileDbg2 (
- 
-         /* NamespaceString device identifier (Required, size = NamePathLength) */
- 
--        DeviceInfo->NamepathOffset = CurrentOffset;
-+        ACPI_MOVE_16_TO_16(&DeviceInfo->NamepathOffset, &CurrentOffset);
-         Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
-             &Subtable);
-         if (ACPI_FAILURE (Status))
-@@ -480,8 +493,9 @@ DtCompileDbg2 (
- 
-         /* Update the device info header */
- 
--        DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
--        CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
-+        ACPI_MOVE_32_TO_16(&DeviceInfo->NamepathLength, &Subtable->Length);
-+        ACPI_MOVE_16_TO_16(&Tmp16, &DeviceInfo->NamepathLength);
-+        CurrentOffset += Tmp16;
-         DtInsertSubtable (ParentTable, Subtable);
- 
-         /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -508,8 +522,8 @@ DtCompileDbg2 (
- 
-         if (Subtable && Subtable->Length)
-         {
--            DeviceInfo->OemDataOffset = CurrentOffset;
--            DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
-+            ACPI_MOVE_16_TO_16(&DeviceInfo->OemDataOffset, &CurrentOffset);
-+            ACPI_MOVE_32_TO_16(&DeviceInfo->OemDataLength, &Subtable->Length);
- 
-             DtInsertSubtable (ParentTable, Subtable);
-         }
-@@ -549,6 +563,8 @@ DtCompileDmar (
-     ACPI_DMAR_DEVICE_SCOPE  *DmarDeviceScope;
-     UINT32                  DeviceScopeLength;
-     UINT32                  PciPathLength;
-+    UINT16		    Tmp16;
-+    UINT16		    HdrType;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
-@@ -578,8 +594,11 @@ DtCompileDmar (
-         DtPushSubtable (Subtable);
- 
-         DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
-+	ACPI_MOVE_16_TO_16(&Tmp16, &DmarHeader->Length);
-+	DmarHeader->Length = Tmp16;
- 
--        switch (DmarHeader->Type)
-+	ACPI_MOVE_16_TO_16(&HdrType, &DmarHeader->Type);
-+        switch (HdrType)
-         {
-         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
- 
-@@ -626,8 +645,8 @@ DtCompileDmar (
-         /*
-          * Optional Device Scope subtables
-          */
--        if ((DmarHeader->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
--            (DmarHeader->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+        if ((HdrType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+            (HdrType == ACPI_DMAR_TYPE_NAMESPACE))
-         {
-             /* These types do not support device scopes */
- 
-@@ -637,7 +656,7 @@ DtCompileDmar (
- 
-         DtPushSubtable (Subtable);
-         DeviceScopeLength = DmarHeader->Length - Subtable->Length -
--            ParentTable->Length;
-+		ParentTable->Length;
-         while (DeviceScopeLength)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
-@@ -762,7 +781,7 @@ DtCompileDrtm (
-         Count++;
-     }
- 
--    DrtmVtl->ValidatedTableCount = Count;
-+    ACPI_MOVE_32_TO_32(&DrtmVtl->ValidatedTableCount, &Count);
-     DtPopSubtable ();
-     ParentTable = DtPeekSubtable ();
- 
-@@ -800,7 +819,7 @@ DtCompileDrtm (
-         Count++;
-     }
- 
--    DrtmRl->ResourceCount = Count;
-+    ACPI_MOVE_32_TO_32(&DrtmRl->ResourceCount, &Count);
-     DtPopSubtable ();
-     ParentTable = DtPeekSubtable ();
- 
-@@ -895,6 +914,7 @@ DtCompileGtdt (
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  GtCount;
-     ACPI_TABLE_HEADER       *Header;
-+    ACPI_GTDT_TIMER_BLOCK   *TimerBlock;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -982,8 +1002,9 @@ DtCompileGtdt (
-             DtPushSubtable (Subtable);
-             ParentTable = DtPeekSubtable ();
- 
--            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
--                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
-+	    TimerBlock = ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER));
-+	    ACPI_MOVE_32_TO_32(&GtCount, &TimerBlock->TimerCount);
- 
-             while (GtCount)
-             {
-@@ -1036,6 +1057,7 @@ DtCompileFpdt (
-     ACPI_DMTABLE_INFO       *InfoTable;
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
-     DT_FIELD                *SubtableStart;
-+    UINT16		    HdrType;
- 
- 
-     while (*PFieldList)
-@@ -1054,7 +1076,8 @@ DtCompileFpdt (
- 
-         FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
- 
--        switch (FpdtHeader->Type)
-+	ACPI_MOVE_16_TO_16(&HdrType, &FpdtHeader->Type);
-+        switch (HdrType)
-         {
-         case ACPI_FPDT_TYPE_BOOT:
- 
-@@ -1112,6 +1135,7 @@ DtCompileHest (
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT16                  Type;
-     UINT32                  BankCount;
-+    UINT16		    Tmp16;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoHest,
-@@ -1129,8 +1153,9 @@ DtCompileHest (
-         /* Get subtable type */
- 
-         SubtableStart = *PFieldList;
--        DtCompileInteger ((UINT8 *) &Type, *PFieldList, 2, 0);
-+        DtCompileInteger ((UINT8 *) &Tmp16, *PFieldList, 2, 0);
- 
-+	ACPI_MOVE_16_TO_16(&Type, &Tmp16);
-         switch (Type)
-         {
-         case ACPI_HEST_TYPE_IA32_CHECK:
-@@ -1480,11 +1505,13 @@ DtCompileIort (
-     ACPI_IORT_SMMU          *IortSmmu;
-     UINT32                  NodeNumber;
-     UINT32                  NodeLength;
-+    UINT32                  NodeOffset;
-     UINT32                  IdMappingNumber;
-     UINT32                  ItsNumber;
-     UINT32                  ContextIrptNumber;
-     UINT32                  PmuIrptNumber;
-     UINT32                  PaddingLength;
-+    UINT32                  MappingOffset;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -1510,7 +1537,7 @@ DtCompileIort (
-      * Optionally allows the generic data types to be used for filling
-      * this field.
-      */
--    Iort->NodeOffset = sizeof (ACPI_TABLE_IORT);
-+    NodeOffset = sizeof (ACPI_TABLE_IORT);
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
-         &Subtable);
-     if (ACPI_FAILURE (Status))
-@@ -1520,7 +1547,7 @@ DtCompileIort (
-     if (Subtable)
-     {
-         DtInsertSubtable (ParentTable, Subtable);
--        Iort->NodeOffset += Subtable->Length;
-+        NodeOffset += Subtable->Length;
-     }
-     else
-     {
-@@ -1530,8 +1557,9 @@ DtCompileIort (
-         {
-             return (Status);
-         }
--        Iort->NodeOffset += PaddingLength;
-+        NodeOffset += PaddingLength;
-     }
-+    ACPI_MOVE_32_TO_32(&Iort->NodeOffset, &NodeOffset);
- 
-     NodeNumber = 0;
-     while (*PFieldList)
-@@ -1585,7 +1613,7 @@ DtCompileIort (
-                 ItsNumber++;
-             }
- 
--            IortItsGroup->ItsCount = ItsNumber;
-+            ACPI_MOVE_32_TO_32(&IortItsGroup->ItsCount, &ItsNumber);
-             break;
- 
-         case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -1619,15 +1647,16 @@ DtCompileIort (
-             }
-             else
-             {
--                if (NodeLength > IortNode->MappingOffset)
-+		ACPI_MOVE_32_TO_32(&MappingOffset, &IortNode->MappingOffset);
-+                if (NodeLength > MappingOffset)
-                 {
-                     return (AE_BAD_DATA);
-                 }
- 
--                if (NodeLength < IortNode->MappingOffset)
-+                if (NodeLength < MappingOffset)
-                 {
-                     Status = DtCompilePadding (
--                        IortNode->MappingOffset - NodeLength,
-+                        MappingOffset - NodeLength,
-                         &Subtable);
-                     if (ACPI_FAILURE (Status))
-                     {
-@@ -1635,7 +1664,8 @@ DtCompileIort (
-                     }
- 
-                     DtInsertSubtable (ParentTable, Subtable);
--                    NodeLength = IortNode->MappingOffset;
-+		    ACPI_MOVE_32_TO_32(&MappingOffset, &IortNode->MappingOffset);
-+                    NodeLength = MappingOffset;
-                 }
-             }
-             break;
-@@ -1668,7 +1698,7 @@ DtCompileIort (
- 
-             /* Compile global interrupt array */
- 
--            IortSmmu->GlobalInterruptOffset = NodeLength;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->GlobalInterruptOffset, &NodeLength);
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
-                 &Subtable);
-             if (ACPI_FAILURE (Status))
-@@ -1682,7 +1712,7 @@ DtCompileIort (
-             /* Compile context interrupt array */
- 
-             ContextIrptNumber = 0;
--            IortSmmu->ContextInterruptOffset = NodeLength;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->ContextInterruptOffset, &NodeLength);
-             while (*PFieldList)
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -1702,12 +1732,12 @@ DtCompileIort (
-                 ContextIrptNumber++;
-             }
- 
--            IortSmmu->ContextInterruptCount = ContextIrptNumber;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->ContextInterruptCount, &ContextIrptNumber);
- 
-             /* Compile PMU interrupt array */
- 
-             PmuIrptNumber = 0;
--            IortSmmu->PmuInterruptOffset = NodeLength;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->PmuInterruptOffset, &NodeLength);
-             while (*PFieldList)
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -1727,7 +1757,7 @@ DtCompileIort (
-                 PmuIrptNumber++;
-             }
- 
--            IortSmmu->PmuInterruptCount = PmuIrptNumber;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->PmuInterruptCount, &PmuIrptNumber);
-             break;
- 
-         case ACPI_IORT_NODE_SMMU_V3:
-@@ -1764,7 +1794,7 @@ DtCompileIort (
- 
-         /* Compile Array of ID mappings */
- 
--        IortNode->MappingOffset = NodeLength;
-+        ACPI_MOVE_32_TO_32(&IortNode->MappingOffset, &NodeLength);
-         IdMappingNumber = 0;
-         while (*PFieldList)
-         {
-@@ -1785,7 +1815,7 @@ DtCompileIort (
-             IdMappingNumber++;
-         }
- 
--        IortNode->MappingCount = IdMappingNumber;
-+        ACPI_MOVE_32_TO_32(&IortNode->MappingCount, &IdMappingNumber);
-         if (!IdMappingNumber)
-         {
-             IortNode->MappingOffset = 0;
-@@ -1800,7 +1830,7 @@ DtCompileIort (
-         NodeNumber++;
-     }
- 
--    Iort->NodeCount = NodeNumber;
-+    ACPI_MOVE_32_TO_32(&Iort->NodeCount, &NodeNumber);
-     return (AE_OK);
- }
- 
-Index: acpica-unix-20190405/source/compiler/dttable2.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/dttable2.c
-+++ acpica-unix-20190405/source/compiler/dttable2.c
-@@ -345,7 +345,7 @@ DtCompileMpst (
-     DtPushSubtable (Subtable);
- 
-     MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
--    SubtableCount = MpstChannelInfo->PowerNodeCount;
-+    ACPI_MOVE_16_TO_16(&SubtableCount, &MpstChannelInfo->PowerNodeCount);
- 
-     while (*PFieldList && SubtableCount)
-     {
-@@ -363,8 +363,8 @@ DtCompileMpst (
-         DtPushSubtable (Subtable);
- 
-         MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
--        PowerStateCount = MpstPowerNode->NumPowerStates;
--        ComponentCount = MpstPowerNode->NumPhysicalComponents;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &MpstPowerNode->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &MpstPowerNode->NumPhysicalComponents);
- 
-         ParentTable = DtPeekSubtable ();
- 
-@@ -517,6 +517,7 @@ DtCompileNfit (
-     UINT32                  Count;
-     ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
-     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
-@@ -550,7 +551,8 @@ DtCompileNfit (
- 
-         NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
- 
--        switch (NfitHeader->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &NfitHeader->Type);
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
- 
-@@ -610,7 +612,7 @@ DtCompileNfit (
-         DtInsertSubtable (ParentTable, Subtable);
-         DtPopSubtable ();
- 
--        switch (NfitHeader->Type)
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_INTERLEAVE:
- 
-@@ -636,7 +638,7 @@ DtCompileNfit (
-                 Count++;
-             }
- 
--            Interleave->LineCount = Count;
-+            ACPI_MOVE_32_TO_32(&Interleave->LineCount, &Count);
-             break;
- 
-         case ACPI_NFIT_TYPE_SMBIOS:
-@@ -681,7 +683,7 @@ DtCompileNfit (
-                 Count++;
-             }
- 
--            Hint->HintCount = (UINT16) Count;
-+            ACPI_MOVE_32_TO_16(&Hint->HintCount, &Count);
-             break;
- 
-         default:
-@@ -957,7 +959,7 @@ DtCompilePmtt (
- 
-             PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER,
-                 (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER)));
--            DomainCount = PmttController->DomainCount;
-+            ACPI_MOVE_16_TO_16(&DomainCount, &PmttController->DomainCount);
- 
-             while (DomainCount)
-             {
-@@ -1177,6 +1179,7 @@ DtCompileS3pt (
-     DT_SUBTABLE             *ParentTable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     DT_FIELD                *SubtableStart;
-+    UINT16		    HdrType;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1204,7 +1207,8 @@ DtCompileS3pt (
- 
-         S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
- 
--        switch (S3ptHeader->Type)
-+	ACPI_MOVE_16_TO_16(&HdrType, &S3ptHeader->Type);
-+        switch (HdrType)
-         {
-         case ACPI_S3PT_TYPE_RESUME:
- 
-@@ -1514,6 +1518,7 @@ DtCompileSlit (
-     DT_FIELD                *FieldList;
-     UINT32                  Localities;
-     UINT8                   *LocalityBuffer;
-+    UINT32		    Tmp;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit,
-@@ -1526,7 +1531,8 @@ DtCompileSlit (
-     ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
- 
--    Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+    Tmp = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+    ACPI_MOVE_32_TO_32(&Localities, &Tmp);
-     LocalityBuffer = UtLocalCalloc (Localities);
- 
-     /* Compile each locality buffer */
-@@ -1725,6 +1731,7 @@ DtCompileTcpa (
-     ACPI_TABLE_TCPA_HDR     *TcpaHeader;
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status;
-+    UINT16		    PlatClass;
- 
- 
-     /* Compile the main table */
-@@ -1745,7 +1752,8 @@ DtCompileTcpa (
-      */
-     TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
- 
--    switch (TcpaHeader->PlatformClass)
-+    ACPI_MOVE_16_TO_16(&PlatClass, &TcpaHeader->PlatformClass);
-+    switch (PlatClass)
-     {
-     case ACPI_TCPA_CLIENT_TABLE:
- 
-@@ -1793,6 +1801,7 @@ DtCompileTpm2Rev3 (
-     ACPI_TABLE_TPM23        *Tpm23Header;
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status = AE_OK;
-+    UINT32		    Tmp32;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm23,
-@@ -1804,7 +1813,8 @@ DtCompileTpm2Rev3 (
- 
-     /* Subtable type depends on the StartMethod */
- 
--    switch (Tpm23Header->StartMethod)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Tpm23Header->StartMethod);
-+    switch (Tmp32)
-     {
-     case ACPI_TPM23_ACPI_START_METHOD:
- 
-@@ -1851,6 +1861,7 @@ DtCompileTpm2 (
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status = AE_OK;
-     ACPI_TABLE_HEADER       *Header;
-+    UINT32		    Tmp32;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -1894,7 +1905,8 @@ DtCompileTpm2 (
- 
-     /* Subtable type depends on the StartMethod */
- 
--    switch (Tpm2Header->StartMethod)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Tpm2Header->StartMethod);
-+    switch (Tmp32)
-     {
-     case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
- 
-@@ -2110,6 +2122,9 @@ DtCompileWpbt (
-     ACPI_TABLE_WPBT         *Table;
-     ACPI_STATUS             Status;
-     UINT16                  Length;
-+    UINT16                  Tmp16;
-+    UINT16		    *Ptr16;
-+    UINT32		    ii;
- 
- 
-     /* Compile the main table */
-@@ -2137,7 +2152,16 @@ DtCompileWpbt (
- 
-     Length = (UINT16) Subtable->TotalLength;
-     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
--    Table->ArgumentsLength = Length;
-+    ACPI_MOVE_16_TO_16(&Table->ArgumentsLength, &Length);
-+
-+    /* The arguments are in Unicode, so make sure the byte order is correct */
-+    Ptr16 = (UINT16 *)Subtable->Buffer;
-+    for (ii = 0; ii < Length; ii++)
-+    {
-+	ACPI_MOVE_16_TO_16(&Tmp16, Ptr16);
-+	*Ptr16 = Tmp16;
-+        Ptr16++;
-+    }
- 
-     ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix-20190405/source/components/disassembler/dmbuffer.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix-20190405/source/components/disassembler/dmbuffer.c
-@@ -204,7 +204,7 @@ AcpiDmByteList (
- 
- 
-     ByteData = Op->Named.Data;
--    ByteCount = (UINT32) Op->Common.Value.Integer;
-+    ByteCount = (UINT32) Op->Common.Value.Size;
- 
-     /*
-      * The byte list belongs to a buffer, and can be produced by either
-@@ -304,7 +304,8 @@ AcpiDmIsUuidBuffer (
-     /* Extract the byte list info */
- 
-     ByteData = NextOp->Named.Data;
--    ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+    /* ByteCount = (UINT32) NextOp->Common.Value.Integer; */
-+    ByteCount = (UINT32) NextOp->Common.Value.Size;
- 
-     /* Byte count must be exactly 16 */
- 
-@@ -424,7 +425,8 @@ AcpiDmIsUnicodeBuffer (
-     /* Extract the byte list info */
- 
-     ByteData = NextOp->Named.Data;
--    ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+    /* ByteCount = (UINT32) NextOp->Common.Value.Integer; */
-+    ByteCount = (UINT32) NextOp->Common.Value.Size;
-     WordCount = ACPI_DIV_2 (ByteCount);
- 
-     /*
-@@ -852,19 +854,22 @@ AcpiDmUnicode (
-     UINT32                  WordCount;
-     UINT32                  i;
-     int                     OutputValue;
-+    UINT16		    Tmp16;
- 
- 
-     /* Extract the buffer info as a WORD buffer */
- 
-     WordData = ACPI_CAST_PTR (UINT16, Op->Named.Data);
--    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Integer));
-+    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Size));
- 
-     /* Write every other byte as an ASCII character */
- 
-     AcpiOsPrintf ("\"");
-     for (i = 0; i < (WordCount - 1); i++)
-     {
--        OutputValue = (int) WordData[i];
-+        /* OutputValue = (int) WordData[i]; */
-+	ACPI_MOVE_16_TO_16(&Tmp16, &WordData[i]);
-+	OutputValue = (int) Tmp16;
- 
-         /* Handle values that must be escaped */
- 
-@@ -973,16 +978,18 @@ AcpiDmCheckForHardwareId (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     UINT32                  Name;
-+    UINT32                  TmpName;
-     ACPI_PARSE_OBJECT       *NextOp;
- 
- 
-     /* Get the NameSegment */
- 
--    Name = AcpiPsGetName (Op);
--    if (!Name)
-+    TmpName = AcpiPsGetName (Op);
-+    if (!TmpName)
-     {
-         return;
-     }
-+    ACPI_MOVE_32_TO_32(&Name, &TmpName);
- 
-     NextOp = AcpiPsGetDepthNext (NULL, Op);
-     if (!NextOp)
-Index: acpica-unix-20190405/source/components/disassembler/dmopcode.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix-20190405/source/components/disassembler/dmopcode.c
-@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
-     char                        *NameString;
-     int                         LastCharIsDigit;
-     int                         LastCharsAreHex;
-+    char			TmpName[ACPI_NAMESEG_SIZE + 1];
- 
- 
-     if (!Op)
-@@ -261,7 +262,9 @@ AcpiDmPredefinedDescription (
- 
-     /* Predefined name must start with an underscore */
- 
--    NameString = ACPI_CAST_PTR (char, &Op->Named.Name);
-+    memset(TmpName, 0, ACPI_NAMESEG_SIZE + 1);
-+    ACPI_MOVE_32_TO_32(TmpName, &Op->Named.Name);
-+    NameString = TmpName;
-     if (NameString[0] != '_')
-     {
-         return;
-@@ -880,25 +883,29 @@ AcpiDmDisassembleOneOp (
-         AcpiDmNamestring (Op->Common.Value.Name);
-         break;
- 
--    case AML_INT_NAMEDFIELD_OP:
-+    case AML_INT_NAMEDFIELD_OP: {
- 
--        Length = AcpiDmDumpName (Op->Named.Name);
-+	UINT32 TmpName;
-+
-+	ACPI_MOVE_32_TO_32(&TmpName, &Op->Named.Name);
-+        Length = AcpiDmDumpName (TmpName);
- 
-         AcpiOsPrintf (",");
-         ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
-         AcpiOsPrintf ("%*.s  %u", (unsigned) (5 - Length), " ",
--            (UINT32) Op->Common.Value.Integer);
-+            (UINT32) Op->Common.Value.Size);
- 
-         AcpiDmCommaIfFieldMember (Op);
- 
--        Info->BitOffset += (UINT32) Op->Common.Value.Integer;
-+        Info->BitOffset += (UINT32) Op->Common.Value.Size;
-         break;
-+    }
- 
-     case AML_INT_RESERVEDFIELD_OP:
- 
-         /* Offset() -- Must account for previous offsets */
- 
--        Offset = (UINT32) Op->Common.Value.Integer;
-+        Offset = Op->Common.Value.Size;
-         Info->BitOffset += Offset;
- 
-         if (Info->BitOffset % 8 == 0)
-@@ -942,10 +949,15 @@ AcpiDmDisassembleOneOp (
- 
-         if (Child->Common.AmlOpcode == AML_INT_BYTELIST_OP)
-         {
-+	    /* UINT64 Tmp64; */
-+
-             AcpiOsPrintf ("\n");
- 
-             Aml = Child->Named.Data;
-+	    /*
-             Length = (UINT32) Child->Common.Value.Integer;
-+	    */
-+            Length = (UINT32) Child->Common.Value.Size;
- 
-             Info->Level += 1;
-             Info->MappingOp = Op;
-Index: acpica-unix-20190405/source/components/disassembler/dmresrcl.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix-20190405/source/components/disassembler/dmresrcl.c
-@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
-     UINT32                  Level)
- {
-     UINT32                  i;
--
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
- 
-     for (i = 0; i < 4; i++)
-     {
-@@ -151,14 +152,14 @@ AcpiDmMemoryFields (
-         {
-         case 16:
- 
--            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
--                AcpiDmMemoryNames[i]);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &(ACPI_CAST_PTR (UINT16, Source)[i]));
-+            AcpiDmDumpInteger16 (Tmp16, AcpiDmMemoryNames[i]);
-             break;
- 
-         case 32:
- 
--            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
--                AcpiDmMemoryNames[i]);
-+	    ACPI_MOVE_32_TO_32(&Tmp32, &(ACPI_CAST_PTR (UINT32, Source)[i]));
-+            AcpiDmDumpInteger32 (Tmp32, AcpiDmMemoryNames[i]);
-             break;
- 
-         default:
-@@ -190,7 +191,9 @@ AcpiDmAddressFields (
-     UINT32                  Level)
- {
-     UINT32                  i;
--
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
-+    UINT64		    Tmp64;
- 
-     AcpiOsPrintf ("\n");
- 
-@@ -202,20 +205,20 @@ AcpiDmAddressFields (
-         {
-         case 16:
- 
--            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
--                AcpiDmAddressNames[i]);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &(ACPI_CAST_PTR (UINT16, Source)[i]));
-+            AcpiDmDumpInteger16 (Tmp16, AcpiDmAddressNames[i]);
-             break;
- 
-         case 32:
- 
--            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
--                AcpiDmAddressNames[i]);
-+	    ACPI_MOVE_32_TO_32(&Tmp32, &(ACPI_CAST_PTR (UINT32, Source)[i]));
-+            AcpiDmDumpInteger32 (Tmp32, AcpiDmAddressNames[i]);
-             break;
- 
-         case 64:
- 
--            AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i],
--                AcpiDmAddressNames[i]);
-+	    ACPI_MOVE_64_TO_64(&Tmp64, &(ACPI_CAST_PTR (UINT64, Source)[i]));
-+            AcpiDmDumpInteger64 (Tmp64, AcpiDmAddressNames[i]);
-             break;
- 
-         default:
-@@ -868,6 +871,7 @@ AcpiDmFixedMemory32Descriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT32 Tmp;
- 
-     /* Dump name and read/write flag */
- 
-@@ -876,12 +880,12 @@ AcpiDmFixedMemory32Descriptor (
-         AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger32 (Resource->FixedMemory32.Address,
--        "Address Base");
-+    ACPI_MOVE_32_TO_32(&Tmp, &Resource->FixedMemory32.Address);
-+    AcpiDmDumpInteger32 (Tmp, "Address Base");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger32 (Resource->FixedMemory32.AddressLength,
--        "Address Length");
-+    ACPI_MOVE_32_TO_32(&Tmp, &Resource->FixedMemory32.AddressLength);
-+    AcpiDmDumpInteger32 (Tmp, "Address Length");
- 
-     /* Insert a descriptor name */
- 
-@@ -913,6 +917,7 @@ AcpiDmGenericRegisterDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT64		    Tmp64;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("Register (");
-@@ -926,7 +931,9 @@ AcpiDmGenericRegisterDescriptor (
-     AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address");
-+    /* AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address"); */
-+    ACPI_MOVE_64_TO_64(&Tmp64, &Resource->GenericReg.Address);
-+    AcpiDmDumpInteger64 (Tmp64, "Address");
- 
-     /* Optional field for ACPI 3.0 */
- 
-@@ -972,7 +979,7 @@ AcpiDmInterruptDescriptor (
-     UINT32                  Level)
- {
-     UINT32                  i;
--
-+    UINT16		    Tmp16;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("Interrupt (%s, %s, %s, %s, ",
-@@ -986,10 +993,11 @@ AcpiDmInterruptDescriptor (
-      * list. Must compute length based on length of the list. First xrupt
-      * is included in the struct (reason for -1 below)
-      */
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->ExtendedIrq.ResourceLength);
-     AcpiDmResourceSource (Resource,
-         sizeof (AML_RESOURCE_EXTENDED_IRQ) +
-             ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
--        Resource->ExtendedIrq.ResourceLength);
-+        Tmp16);
- 
-     /* Insert a descriptor name */
- 
-@@ -1002,9 +1010,12 @@ AcpiDmInterruptDescriptor (
-     AcpiOsPrintf ("{\n");
-     for (i = 0; i < Resource->ExtendedIrq.InterruptCount; i++)
-     {
-+	UINT32 Tmp32, Val32;
-+
-         AcpiDmIndent (Level + 1);
--        AcpiOsPrintf ("0x%8.8X,\n",
--            (UINT32) Resource->ExtendedIrq.Interrupts[i]);
-+	Val32 = (UINT32) Resource->ExtendedIrq.Interrupts[i];
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Val32);
-+        AcpiOsPrintf ("0x%8.8X,\n", Tmp32);
-     }
- 
-     AcpiDmIndent (Level);
-Index: acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
-@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
-     char                    *DeviceName = NULL;
-     UINT32                  PinCount;
-     UINT32                  i;
-+    UINT16		    Tmp16;
- 
- 
-     /* ResourceSource, ResourceSourceIndex, ResourceType */
- 
-     AcpiDmIndent (Level + 1);
--    if (Resource->Gpio.ResSourceOffset)
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.ResSourceOffset);
-+    if (Tmp16)
-     {
--        DeviceName = ACPI_ADD_PTR (char,
--            Resource, Resource->Gpio.ResSourceOffset),
-+        DeviceName = ACPI_ADD_PTR (char, Resource, Tmp16),
-         AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-     }
- 
-     AcpiOsPrintf (", ");
-     AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.Flags);
-     AcpiOsPrintf ("%s, ",
--        AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
-+        AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
- 
-     /* Insert a descriptor name */
- 
-@@ -215,15 +217,16 @@ AcpiDmGpioCommon (
- 
-     /* Dump the vendor data */
- 
--    if (Resource->Gpio.VendorOffset)
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorOffset);
-+    if (Tmp16)
-     {
-         AcpiOsPrintf ("\n");
-         AcpiDmIndent (Level + 1);
--        VendorData = ACPI_ADD_PTR (UINT8, Resource,
--            Resource->Gpio.VendorOffset);
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorOffset);
-+        VendorData = ACPI_ADD_PTR (UINT8, Resource, Tmp16);
- 
--        AcpiDmDumpRawDataBuffer (VendorData,
--            Resource->Gpio.VendorLength, Level);
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorLength);
-+        AcpiDmDumpRawDataBuffer (VendorData, Tmp16, Level);
-     }
- 
-     AcpiOsPrintf (")\n");
-@@ -233,17 +236,25 @@ AcpiDmGpioCommon (
-     AcpiDmIndent (Level + 1);
-     AcpiOsPrintf ("{   // Pin list\n");
- 
-+    /*
-     PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
-         Resource->Gpio.PinTableOffset)) /
-         sizeof (UINT16);
-+    */
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.ResSourceOffset);
-+    PinCount = (UINT32) Tmp16;
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.PinTableOffset);
-+    PinCount -= (UINT32) Tmp16;
-+    PinCount /= sizeof (UINT16);
- 
--    PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
--        Resource->Gpio.PinTableOffset);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.PinTableOffset);
-+    PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource, Tmp16);
- 
-     for (i = 0; i < PinCount; i++)
-     {
-         AcpiDmIndent (Level + 2);
--        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+	ACPI_MOVE_16_TO_16(&Tmp16, &PinList[i]);
-+        AcpiOsPrintf ("0x%4.4X%s\n", Tmp16,
-             ((i + 1) < PinCount) ? "," : "");
-     }
- 
-@@ -277,16 +288,18 @@ AcpiDmGpioIntDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16		    Tmp16;
- 
-     /* Dump the GpioInt-specific portion of the descriptor */
- 
-     /* EdgeLevel, ActiveLevel, Shared */
- 
-     AcpiDmIndent (Level);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
--        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
--        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
--        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
-+        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 1)],
-+        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
- 
-     /* PinConfig, DebounceTimeout */
- 
-@@ -299,7 +312,8 @@ AcpiDmGpioIntDescriptor (
-     {
-         AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
-     }
--    AcpiOsPrintf ("0x%4.4X,\n", Resource->Gpio.DebounceTimeout);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DebounceTimeout);
-+    AcpiOsPrintf ("0x%4.4X,\n", Tmp16);
- 
-     /* Dump the GpioInt/GpioIo common portion of the descriptor */
- 
-@@ -329,14 +343,16 @@ AcpiDmGpioIoDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16		    Tmp16;
- 
-     /* Dump the GpioIo-specific portion of the descriptor */
- 
-     /* Shared, PinConfig */
- 
-     AcpiDmIndent (Level);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("GpioIo (%s, ",
--        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
- 
-     if (Resource->Gpio.PinConfig <= 3)
-     {
-@@ -350,10 +366,13 @@ AcpiDmGpioIoDescriptor (
- 
-     /* DebounceTimeout, DriveStrength, IoRestriction */
- 
--    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
--    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DebounceTimeout);
-+    AcpiOsPrintf ("0x%4.4X, ", Tmp16);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DriveStrength);
-+    AcpiOsPrintf ("0x%4.4X, ", Tmp16);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("%s,\n",
--        AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
-+        AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Tmp16)]);
- 
-     /* Dump the GpioInt/GpioIo common portion of the descriptor */
- 
-@@ -533,6 +552,7 @@ AcpiDmDumpSerialBusVendorData (
- {
-     UINT8                   *VendorData;
-     UINT32                  VendorLength;
-+    UINT16                  Tmp16;
- 
- 
-     /* Get the (optional) vendor data and length */
-@@ -541,8 +561,8 @@ AcpiDmDumpSerialBusVendorData (
-     {
-     case AML_RESOURCE_I2C_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
--            AML_RESOURCE_I2C_MIN_DATA_LEN;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+        VendorLength = Tmp16 - AML_RESOURCE_I2C_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-             sizeof (AML_RESOURCE_I2C_SERIALBUS));
-@@ -550,8 +570,8 @@ AcpiDmDumpSerialBusVendorData (
- 
-     case AML_RESOURCE_SPI_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
--            AML_RESOURCE_SPI_MIN_DATA_LEN;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+        VendorLength = Tmp16 - AML_RESOURCE_SPI_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-             sizeof (AML_RESOURCE_SPI_SERIALBUS));
-@@ -559,8 +579,8 @@ AcpiDmDumpSerialBusVendorData (
- 
-     case AML_RESOURCE_UART_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
--            AML_RESOURCE_UART_MIN_DATA_LEN;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+        VendorLength = Tmp16 - AML_RESOURCE_UART_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-             sizeof (AML_RESOURCE_UART_SERIALBUS));
-@@ -601,24 +621,29 @@ AcpiDmI2cSerialBusDescriptor (
- {
-     UINT32                  ResourceSourceOffset;
-     char                    *DeviceName;
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
- 
- 
-     /* SlaveAddress, SlaveMode, ConnectionSpeed, AddressingMode */
- 
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->I2cSerialBus.SlaveAddress);
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Resource->I2cSerialBus.ConnectionSpeed);
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
--        Resource->I2cSerialBus.SlaveAddress,
-+        Tmp16,
-         AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
--        Resource->I2cSerialBus.ConnectionSpeed);
-+        Tmp32);
- 
-     AcpiDmIndent (Level + 1);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->I2cSerialBus.TypeSpecificFlags);
-     AcpiOsPrintf ("%s, ",
--        AcpiGbl_AmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.TypeSpecificFlags)]);
-+        AcpiGbl_AmDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
- 
-     /* ResourceSource is a required field */
- 
--    ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
--        Resource->CommonSerialBus.TypeDataLength;
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+    ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) + Tmp16;
- 
-     DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
-     AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix-20190405/source/components/disassembler/dmresrcs.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix-20190405/source/components/disassembler/dmresrcs.c
-@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16 Tmp;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("%s (",
-@@ -93,7 +94,8 @@ AcpiDmIrqDescriptor (
-     AcpiOsPrintf (")\n");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmBitList (Resource->Irq.IrqMask);
-+    ACPI_MOVE_16_TO_16(&Tmp, &Resource->Irq.IrqMask);
-+    AcpiDmBitList (Tmp);
- }
- 
- 
-@@ -204,16 +206,19 @@ AcpiDmIoDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16 Tmp16;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("IO (%s,\n",
-         AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Io.Minimum);
-+    AcpiDmDumpInteger16 (Tmp16, "Range Minimum");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->Io.Maximum, "Range Maximum");
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Io.Maximum);
-+    AcpiDmDumpInteger16 (Tmp16, "Range Maximum");
- 
-     AcpiDmIndent (Level + 1);
-     AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
-@@ -251,12 +256,14 @@ AcpiDmFixedIoDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16                  Tmp16;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("FixedIO (\n");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->FixedIo.Address, "Address");
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->FixedIo.Address);
-+    AcpiDmDumpInteger16 (Tmp16, "Address");
- 
-     AcpiDmIndent (Level + 1);
-     AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix-20190405/source/components/dispatcher/dsfield.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix-20190405/source/components/dispatcher/dsfield.c
-@@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
-     ACPI_STATUS             Status;
-     UINT64                  Position;
-     ACPI_PARSE_OBJECT       *Child;
-+    UINT32 TmpName;
- 
- #ifdef ACPI_EXEC_APP
-     UINT64                  Value = 0;
-@@ -439,10 +440,17 @@ AcpiDsGetFieldNames (
- 
-             /* Lookup the name, it should already exist */
- 
-+	    ACPI_MOVE_32_TO_32(&TmpName, &Arg->Named.Name);
-+            Status = AcpiNsLookup (WalkState->ScopeInfo,
-+                (char *) &TmpName, Info->FieldType,
-+                ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
-+                WalkState, &Info->FieldNode);
-+	/*
-             Status = AcpiNsLookup (WalkState->ScopeInfo,
-                 (char *) &Arg->Named.Name, Info->FieldType,
-                 ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
-                 WalkState, &Info->FieldNode);
-+	*/
-             if (ACPI_FAILURE (Status))
-             {
-                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-@@ -692,9 +700,17 @@ AcpiDsInitFieldObjects (
-          */
-         if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
-         {
-+	    UINT32 TmpName;
-+
-+            ACPI_MOVE_32_TO_32(&TmpName, &Arg->Named.Name);
-+            Status = AcpiNsLookup (WalkState->ScopeInfo,
-+                (char *) &TmpName, Type, ACPI_IMODE_LOAD_PASS1,
-+                Flags, WalkState, &Node);
-+	/*
-             Status = AcpiNsLookup (WalkState->ScopeInfo,
-                 (char *) &Arg->Named.Name, Type, ACPI_IMODE_LOAD_PASS1,
-                 Flags, WalkState, &Node);
-+	*/
-             if (ACPI_FAILURE (Status))
-             {
-                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix-20190405/source/components/events/evgpeblk.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/events/evgpeblk.c
-+++ acpica-unix-20190405/source/components/events/evgpeblk.c
-@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
-     ACPI_STATUS             Status;
-     ACPI_GPE_BLOCK_INFO     *GpeBlock;
-     ACPI_GPE_WALK_INFO      WalkInfo;
-+    char		    Name[ACPI_NAMESEG_SIZE + 1];
- 
- 
-     ACPI_FUNCTION_TRACE (EvCreateGpeBlock);
-@@ -396,7 +397,7 @@ AcpiEvCreateGpeBlock (
- 
-     /* Initialize the new GPE block */
- 
--    GpeBlock->Address = Address;
-+    ACPI_MOVE_64_TO_64(&GpeBlock->Address, &Address);
-     GpeBlock->SpaceId = SpaceId;
-     GpeBlock->Node = GpeDevice;
-     GpeBlock->GpeCount = (UINT16) (RegisterCount * ACPI_GPE_REGISTER_WIDTH);
-@@ -445,11 +446,13 @@ AcpiEvCreateGpeBlock (
-         (*ReturnGpeBlock) = GpeBlock;
-     }
- 
-+    memset(&Name, 0, ACPI_NAMESEG_SIZE + 1);
-+    ACPI_MOVE_32_TO_32(&Name, &GpeDevice->Name.Ascii);
-     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-         "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n",
-         (UINT32) GpeBlock->BlockBaseNumber,
-         (UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1)),
--        GpeDevice->Name.Ascii, GpeBlock->RegisterCount, InterruptNumber,
-+        Name, GpeBlock->RegisterCount, InterruptNumber,
-         InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
- 
-     /* Update global count of currently available GPEs */
-Index: acpica-unix-20190405/source/components/hardware/hwregs.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20190405/source/components/hardware/hwregs.c
-@@ -197,7 +197,7 @@ AcpiHwValidateRegister (
-      * Address must not be null. A null address also indicates an optional
-      * ACPI register that is not supported, so no error message.
-      */
--    ACPI_MOVE_64_TO_64 (Address, &Reg->Address);
-+    *Address =  Reg->Address;
-     if (!(*Address))
-     {
-         return (AE_BAD_ADDRESS);
-Index: acpica-unix-20190405/source/components/hardware/hwvalid.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix-20190405/source/components/hardware/hwvalid.c
-@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
-     UINT32                  ByteWidth;
-     ACPI_IO_ADDRESS         LastAddress;
-     const ACPI_PORT_INFO    *PortInfo;
-+    UINT64                  Max16;
-+    UINT64                  Tmp64;
- 
- 
-     ACPI_FUNCTION_TRACE (HwValidateIoRequest);
-@@ -162,7 +164,10 @@ AcpiHwValidateIoRequest (
- 
-     /* Maximum 16-bit address in I/O space */
- 
--    if (LastAddress > ACPI_UINT16_MAX)
-+    Max16 = (UINT64) ACPI_UINT16_MAX;
-+    ACPI_MOVE_64_TO_64(&Tmp64, &Max16);
-+
-+    if ((UINT64)LastAddress > Tmp64)
-     {
-         ACPI_ERROR ((AE_INFO,
-             "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix-20190405/source/components/namespace/nsaccess.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix-20190405/source/components/namespace/nsaccess.c
-@@ -314,6 +314,7 @@ AcpiNsLookup (
-     UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
-     UINT32                  LocalFlags;
-     ACPI_INTERPRETER_MODE   LocalInterpreterMode;
-+    UINT32		    Tmp32;
- 
- 
-     ACPI_FUNCTION_TRACE (NsLookup);
-@@ -723,9 +724,10 @@ AcpiNsLookup (
-             {
-                 /* Complain about a type mismatch */
- 
-+		ACPI_MOVE_32_TO_32(&Tmp32, &SimpleName);
-                 ACPI_WARNING ((AE_INFO,
-                     "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",
--                    ACPI_CAST_PTR (char, &SimpleName),
-+                    ACPI_CAST_PTR (char, &Tmp32),
-                     AcpiUtGetTypeName (ThisNode->Type),
-                     AcpiUtGetTypeName (TypeToCheckFor)));
-             }
-Index: acpica-unix-20190405/source/components/namespace/nsparse.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/namespace/nsparse.c
-+++ acpica-unix-20190405/source/components/namespace/nsparse.c
-@@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
- 
-     /* Table must consist of at least a complete header */
- 
--    if (Table->Length < sizeof (ACPI_TABLE_HEADER))
-+    ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);
-+    if (AmlLength < sizeof (ACPI_TABLE_HEADER))
-     {
-         return_ACPI_STATUS (AE_BAD_HEADER);
-     }
- 
-     AmlStart = (UINT8 *) Table + sizeof (ACPI_TABLE_HEADER);
--    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    AmlLength -= sizeof (ACPI_TABLE_HEADER);
- 
-     Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
-     if (ACPI_FAILURE (Status))
-Index: acpica-unix-20190405/source/components/tables/tbdata.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbdata.c
-+++ acpica-unix-20190405/source/components/tables/tbdata.c
-@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
-     UINT32                  *TableIndex)
- {
-     ACPI_STATUS             Status = AE_OK;
-+    UINT32		    Length;
- 
- 
-     ACPI_FUNCTION_TRACE (TbVerifyTempTable);
-@@ -581,7 +582,8 @@ AcpiTbVerifyTempTable (
-     {
-         /* Verify the checksum */
- 
--        Status = AcpiTbVerifyChecksum (TableDesc->Pointer, TableDesc->Length);
-+        ACPI_MOVE_32_TO_32(&Length, &TableDesc->Length);
-+        Status = AcpiTbVerifyChecksum (TableDesc->Pointer, Length);
-         if (ACPI_FAILURE (Status))
-         {
-             ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix-20190405/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20190405/source/components/tables/tbfadt.c
-@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
-     ACPI_TABLE_HEADER       *Table,
-     UINT32                  Length)
- {
-+    UINT32 Tmp32;
- 
-     /*
-      * Check if the FADT is larger than the largest table that we expect
-      * (typically the current ACPI specification version). If so, truncate
-      * the table, and issue a warning.
-      */
--    if (Length > sizeof (ACPI_TABLE_FADT))
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Length);
-+    if (Tmp32 > sizeof (ACPI_TABLE_FADT))
-     {
-         ACPI_BIOS_WARNING ((AE_INFO,
-             "FADT (revision %u) is longer than %s length, "
-             "truncating length %u to %u",
--            Table->Revision, ACPI_FADT_CONFORMANCE, Length,
-+            Table->Revision, ACPI_FADT_CONFORMANCE, Tmp32,
-             (UINT32) sizeof (ACPI_TABLE_FADT)));
-     }
- 
-@@ -446,7 +448,7 @@ AcpiTbCreateLocalFadt (
-     /* Copy the original FADT, up to sizeof (ACPI_TABLE_FADT) */
- 
-     memcpy (&AcpiGbl_FADT, Table,
--        ACPI_MIN (Length, sizeof (ACPI_TABLE_FADT)));
-+        ACPI_MIN (Tmp32, sizeof (ACPI_TABLE_FADT)));
- 
-     /* Take a copy of the Hardware Reduced flag */
- 
-@@ -520,6 +522,8 @@ AcpiTbConvertFadt (
-     UINT8                   Length;
-     UINT8                   Flags;
-     UINT32                  i;
-+    UINT32		    Tmp32;
-+    UINT64		    Tmp64;
- 
- 
-     /*
-@@ -533,7 +537,8 @@ AcpiTbConvertFadt (
-      * Note: The FADT revision value is unreliable. Only the length can be
-      * trusted.
-      */
--    if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &AcpiGbl_FADT.Header.Length);
-+    if (Tmp32 <= ACPI_FADT_V2_SIZE)
-     {
-         AcpiGbl_FADT.PreferredProfile = 0;
-         AcpiGbl_FADT.PstateControl = 0;
-@@ -546,14 +551,15 @@ AcpiTbConvertFadt (
-      * current FADT version as defined by the ACPI specification.
-      * Thus, we will have a common FADT internally.
-      */
--    AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
-+    Tmp32 = sizeof (ACPI_TABLE_FADT);
-+    ACPI_MOVE_32_TO_32(&AcpiGbl_FADT.Header.Length, &Tmp32);
- 
-     /*
-      * Expand the 32-bit DSDT addresses to 64-bit as necessary.
-      * Later ACPICA code will always use the X 64-bit field.
-      */
--    AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
--        AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+    Tmp64 = AcpiTbSelectAddress ("DSDT", AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+    ACPI_MOVE_64_TO_64(&AcpiGbl_FADT.XDsdt, &Tmp64);
- 
-     /* If Hardware Reduced flag is set, we are all done */
- 
-@@ -614,7 +620,9 @@ AcpiTbConvertFadt (
-         {
-             if (Address64->Address)
-             {
--                if (Address64->Address != (UINT64) Address32)
-+		ACPI_MOVE_32_TO_32(&Tmp32, &Address32);
-+		ACPI_MOVE_64_TO_64(&Tmp64, &Address64->Address);
-+                if (Tmp64 != (UINT64) Tmp32)
-                 {
-                     /* Address mismatch */
- 
-@@ -655,9 +663,11 @@ AcpiTbConvertFadt (
-              */
-             if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
-             {
-+		ACPI_MOVE_32_TO_32(&Tmp32, &Address32); /* back to host order */
-+		Tmp64 = (UINT64) Tmp32;			/* promote only */
-                 AcpiTbInitGenericAddress (Address64,
-                     ACPI_ADR_SPACE_SYSTEM_IO, Length,
--                    (UINT64) Address32, Name, Flags);
-+                    Tmp64, Name, Flags);
-             }
-         }
- 
-@@ -780,10 +790,14 @@ AcpiTbSetupFadtRegisters (
- 
-         if (Source64->Address)
-         {
-+	    UINT64 Tmp64, Addr64;
-+
-+	    ACPI_MOVE_64_TO_64(&Tmp64, &Source64->Address);
-+	    Tmp64 += (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
-+	    ACPI_MOVE_64_TO_64(&Addr64, &Tmp64);
-             AcpiTbInitGenericAddress (FadtPmInfoTable[i].Target,
-                 Source64->SpaceId, Pm1RegisterByteWidth,
--                Source64->Address +
--                    (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth),
-+                Addr64,
-                 "PmRegisters", 0);
-         }
-     }
-Index: acpica-unix-20190405/source/components/tables/tbfind.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbfind.c
-+++ acpica-unix-20190405/source/components/tables/tbfind.c
-@@ -108,8 +108,11 @@ AcpiTbFindTable (
-     (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-     for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
-     {
-+        UINT32 Tmp32;
-+
-+        ACPI_MOVE_32_TO_32(&Tmp32, &Header.Signature);
-         if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature),
--            Header.Signature, ACPI_NAMESEG_SIZE))
-+            &Tmp32, ACPI_NAMESEG_SIZE))
-         {
-             /* Not the requested table */
- 
-Index: acpica-unix-20190405/source/components/tables/tbprint.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbprint.c
-+++ acpica-unix-20190405/source/components/tables/tbprint.c
-@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
-     ACPI_TABLE_HEADER       *Header)
- {
-     ACPI_TABLE_HEADER       LocalHeader;
-+    UINT32		    Len;
-+    UINT32		    OemRev;
-+    UINT32		    CompilerRev;
- 
- 
-     if (ACPI_COMPARE_NAMESEG (Header->Signature, ACPI_SIG_FACS))
-     {
-         /* FACS only has signature and length fields */
- 
-+	ACPI_MOVE_32_TO_32(&Len, &Header->Length);
-         ACPI_INFO (("%-4.4s 0x%8.8X%8.8X %06X",
--            Header->Signature, ACPI_FORMAT_UINT64 (Address),
--            Header->Length));
-+            Header->Signature, ACPI_FORMAT_UINT64 (Address), Len));
-     }
-     else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature))
-     {
-@@ -174,13 +177,16 @@ AcpiTbPrintTableHeader (
- 
-         AcpiTbCleanupTableHeader (&LocalHeader, Header);
- 
-+	ACPI_MOVE_32_TO_32(&Len, &LocalHeader.Length);
-+	ACPI_MOVE_32_TO_32(&OemRev, &LocalHeader.OemRevision);
-+	ACPI_MOVE_32_TO_32(&CompilerRev, &LocalHeader.AslCompilerRevision);
-         ACPI_INFO ((
-             "%-4.4s 0x%8.8X%8.8X"
-             " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
-             LocalHeader.Signature, ACPI_FORMAT_UINT64 (Address),
--            LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
--            LocalHeader.OemTableId, LocalHeader.OemRevision,
--            LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
-+            Len, LocalHeader.Revision, LocalHeader.OemId,
-+            LocalHeader.OemTableId, OemRev,
-+            LocalHeader.AslCompilerId, CompilerRev));
-     }
- }
- 
-Index: acpica-unix-20190405/source/components/tables/tbutils.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20190405/source/components/tables/tbutils.c
-@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
-          * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
-          *  return 64-bit
-          */
--        ACPI_MOVE_64_TO_64 (&Address64, TableEntry);
-+	Address64 = (UINT64) TableEntry;
- 
- #if ACPI_MACHINE_WIDTH == 32
-         if (Address64 > ACPI_UINT32_MAX)
-@@ -251,7 +251,8 @@ AcpiTbGetRootTableEntry (
-                 ACPI_FORMAT_UINT64 (Address64)));
-         }
- #endif
--        return ((ACPI_PHYSICAL_ADDRESS) (Address64));
-+        return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-+            UINT64, Address64)));
-     }
- }
- 
-@@ -287,6 +288,7 @@ AcpiTbParseRootTable (
-     UINT8                   *TableEntry;
-     ACPI_STATUS             Status;
-     UINT32                  TableIndex;
-+    UINT32                  Tmp32;
- 
- 
-     ACPI_FUNCTION_TRACE (TbParseRootTable);
-@@ -345,7 +347,7 @@ AcpiTbParseRootTable (
-      * Validate length of the table, and map entire table.
-      * Minimum length table must contain at least one entry.
-      */
--    Length = Table->Length;
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
- 
-     if (Length < (sizeof (ACPI_TABLE_HEADER) + TableEntrySize))
-@@ -372,7 +374,7 @@ AcpiTbParseRootTable (
- 
-     /* Get the number of entries and pointer to first entry */
- 
--    TableCount = (UINT32) ((Table->Length - sizeof (ACPI_TABLE_HEADER)) /
-+    TableCount = (UINT32) ((Length - sizeof (ACPI_TABLE_HEADER)) /
-         TableEntrySize);
-     TableEntry = ACPI_ADD_PTR (UINT8, Table, sizeof (ACPI_TABLE_HEADER));
- 
-@@ -394,10 +396,10 @@ AcpiTbParseRootTable (
-         Status = AcpiTbInstallStandardTable (Address,
-             ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex);
- 
-+	ACPI_MOVE_32_TO_32(&Tmp32,
-+			   &AcpiGbl_RootTableList.Tables[TableIndex].Signature);
-         if (ACPI_SUCCESS (Status) &&
--            ACPI_COMPARE_NAMESEG (
--                &AcpiGbl_RootTableList.Tables[TableIndex].Signature,
--                ACPI_SIG_FADT))
-+            ACPI_COMPARE_NAMESEG (&Tmp32, ACPI_SIG_FADT))
-         {
-             AcpiGbl_FadtIndex = TableIndex;
-             AcpiTbParseFadt ();
-Index: acpica-unix-20190405/source/components/tables/tbxface.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbxface.c
-+++ acpica-unix-20190405/source/components/tables/tbxface.c
-@@ -293,8 +293,11 @@ AcpiGetTableHeader (
- 
-     for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
-     {
-+	UINT32 Tmp32;
-+
-+	ACPI_MOVE_32_TO_32(&Tmp32, (UINT32 *)Signature);
-         if (!ACPI_COMPARE_NAMESEG (
--                &(AcpiGbl_RootTableList.Tables[i].Signature), Signature))
-+                &(AcpiGbl_RootTableList.Tables[i].Signature), &Tmp32))
-         {
-             continue;
-         }
-Index: acpica-unix-20190405/source/components/tables/tbxfload.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbxfload.c
-+++ acpica-unix-20190405/source/components/tables/tbxfload.c
-@@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
-     ACPI_TABLE_DESC         *Table;
-     UINT32                  TablesLoaded = 0;
-     UINT32                  TablesFailed = 0;
-+    UINT32		    Tmp32;
- 
- 
-     ACPI_FUNCTION_TRACE (TbLoadNamespace);
-@@ -166,8 +167,9 @@ AcpiTbLoadNamespace (
-      */
-     Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex];
- 
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Table->Signature.Ascii);
-     if (!AcpiGbl_RootTableList.CurrentTableCount ||
--        !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_DSDT) ||
-+        !ACPI_COMPARE_NAMESEG (&Tmp32, ACPI_SIG_DSDT) ||
-          ACPI_FAILURE (AcpiTbValidateTable (Table)))
-     {
-         Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix-20190405/source/tools/acpiexec/aetables.c
-===================================================================
---- acpica-unix-20190405.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix-20190405/source/tools/acpiexec/aetables.c
-@@ -146,21 +146,25 @@ AeInitializeTableHeader (
-     char                    *Signature,
-     UINT32                  Length)
- {
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
- 
-     ACPI_COPY_NAMESEG (Header->Signature, Signature);
--    Header->Length = Length;
-+    ACPI_MOVE_32_TO_32(&Header->Length, &Length);
- 
--    Header->OemRevision = 0x1001;
-+    Tmp16 = 0x1001;
-+    ACPI_MOVE_16_TO_16(&Header->OemRevision, &Tmp16);
-     memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE);
-     memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
-     ACPI_COPY_NAMESEG (Header->AslCompilerId, "INTL");
--    Header->AslCompilerRevision = ACPI_CA_VERSION;
-+    Tmp32 = ACPI_CA_VERSION;
-+    ACPI_MOVE_32_TO_32(&Header->AslCompilerRevision, &Tmp32);
- 
-     /* Set the checksum, must set to zero first */
- 
-     Header->Checksum = 0;
-     Header->Checksum = (UINT8) -AcpiTbChecksum (
--        (void *) Header, Header->Length);
-+        (void *) Header, Length);
- }
- 
- 
-@@ -188,6 +192,7 @@ AeBuildLocalTables (
-     ACPI_NEW_TABLE_DESC     *NextTable;
-     UINT32                  NextIndex;
-     ACPI_TABLE_FADT         *ExternalFadt = NULL;
-+    UINT32		    Tmp32;
- 
- 
-     /*
-@@ -374,6 +379,8 @@ AeBuildLocalTables (
-     }
-     else
-     {
-+        UINT64		    Tmp64;
-+
-         /*
-          * Build a local FADT so we can test the hardware/event init
-          */
-@@ -385,34 +392,44 @@ AeBuildLocalTables (
-         LocalFADT.Facs = 0;
- 
-         LocalFADT.XDsdt = DsdtAddress;
--        LocalFADT.XFacs = ACPI_PTR_TO_PHYSADDR (&LocalFACS);
-+        Tmp64 = ACPI_PTR_TO_PHYSADDR (&LocalFACS);
-+        ACPI_MOVE_64_TO_64(&LocalFADT.XFacs, &Tmp64);
- 
-         /* Miscellaneous FADT fields */
- 
-         LocalFADT.Gpe0BlockLength = 0x20;
--        LocalFADT.Gpe0Block = 0x00003210;
-+        Tmp32 = 0x00003210;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Gpe0Block, &Tmp32);
- 
-         LocalFADT.Gpe1BlockLength = 0x20;
--        LocalFADT.Gpe1Block = 0x0000BA98;
-+        Tmp32 = 0x0000BA98;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Gpe1Block, &Tmp32);
-         LocalFADT.Gpe1Base = 0x80;
- 
-         LocalFADT.Pm1EventLength = 4;
--        LocalFADT.Pm1aEventBlock = 0x00001aaa;
--        LocalFADT.Pm1bEventBlock = 0x00001bbb;
-+        Tmp32 = 0x00001aaa;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm1aEventBlock, &Tmp32);
-+        Tmp32 = 0x00001bbb;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm1bEventBlock, &Tmp32);
- 
-         LocalFADT.Pm1ControlLength = 2;
--        LocalFADT.Pm1aControlBlock = 0xB0;
-+        Tmp32 = 0xB0;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm1aControlBlock, &Tmp32);
- 
-         LocalFADT.PmTimerLength = 4;
--        LocalFADT.PmTimerBlock = 0xA0;
-+        Tmp32 = 0xA0;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.PmTimerBlock, &Tmp32);
- 
--        LocalFADT.Pm2ControlBlock = 0xC0;
-+        Tmp32 = 0xC0;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm2ControlBlock, &Tmp32);
-         LocalFADT.Pm2ControlLength = 1;
- 
-         /* Setup one example X-64 GAS field */
- 
-         LocalFADT.XPm1bEventBlock.SpaceId = ACPI_ADR_SPACE_SYSTEM_IO;
--        LocalFADT.XPm1bEventBlock.Address = LocalFADT.Pm1bEventBlock;
-+	ACPI_MOVE_32_TO_32(&Tmp32, &LocalFADT.Pm1bEventBlock);
-+	Tmp64 = (UINT64)Tmp32;
-+        ACPI_MOVE_64_TO_64(&LocalFADT.XPm1bEventBlock.Address, &Tmp64);
-         LocalFADT.XPm1bEventBlock.BitWidth = (UINT8)
-             ACPI_MUL_8 (LocalFADT.Pm1EventLength);
-     }
-@@ -425,13 +442,17 @@ AeBuildLocalTables (
-     memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
-     ACPI_COPY_NAMESEG (LocalFACS.Signature, ACPI_SIG_FACS);
- 
--    LocalFACS.Length = sizeof (ACPI_TABLE_FACS);
--    LocalFACS.GlobalLock = 0x11AA0011;
-+    Tmp32 = sizeof (ACPI_TABLE_FACS);
-+    ACPI_MOVE_32_TO_32(&LocalFACS.Length, &Tmp32);
-+    Tmp32 = 0x11AA0011;
-+    ACPI_MOVE_32_TO_32(&LocalFACS.GlobalLock, &Tmp32);
- 
-     /* Build the optional local tables */
- 
-     if (AcpiGbl_LoadTestTables)
-     {
-+	UINT32 Tmp32;
-+
-         /*
-          * Build a fake table [TEST] so that we make sure that the
-          * ACPICA core ignores it
-@@ -440,11 +461,12 @@ AeBuildLocalTables (
-         ACPI_COPY_NAMESEG (LocalTEST.Signature, "TEST");
- 
-         LocalTEST.Revision = 1;
--        LocalTEST.Length = sizeof (ACPI_TABLE_HEADER);
-+        Tmp32 = sizeof (ACPI_TABLE_HEADER);
-+        ACPI_MOVE_32_TO_32(&LocalTEST.Length, &Tmp32);
- 
-         LocalTEST.Checksum = 0;
-         LocalTEST.Checksum = (UINT8) -AcpiTbChecksum (
--            (void *) &LocalTEST, LocalTEST.Length);
-+            (void *) &LocalTEST, Tmp32);
- 
-         /*
-          * Build a fake table with a bad signature [BAD!] so that we make
-@@ -454,11 +476,12 @@ AeBuildLocalTables (
-         ACPI_COPY_NAMESEG (LocalBADTABLE.Signature, "BAD!");
- 
-         LocalBADTABLE.Revision = 1;
--        LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER);
-+        Tmp32 = sizeof (ACPI_TABLE_HEADER);
-+        ACPI_MOVE_32_TO_32(&LocalBADTABLE.Length, &Tmp32);
- 
-         LocalBADTABLE.Checksum = 0;
-         LocalBADTABLE.Checksum = (UINT8) -AcpiTbChecksum (
--            (void *) &LocalBADTABLE, LocalBADTABLE.Length);
-+            (void *) &LocalBADTABLE, Tmp32);
-     }
- 
-     return (AE_OK);
-Index: acpica-unix-20190405/source/common/dmswitch.c
-===================================================================
---- acpica-unix-20190405.orig/source/common/dmswitch.c
-+++ acpica-unix-20190405/source/common/dmswitch.c
-@@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
-     ACPI_PARSE_OBJECT_LIST  *Current;
-     ACPI_PARSE_OBJECT_LIST  *Previous;
-     BOOLEAN                 FoundTemp = FALSE;
-+    UINT32		    Tmp32;
- 
- 
-     switch (Op->Common.AmlOpcode)
-     {
-     case AML_NAME_OP:
- 
--        Temp = (char *) (&Op->Named.Name);
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Op->Named.Name);
-+        Temp = (char *) (&Tmp32);
- 
-         if (!strncmp(Temp, "_T_", 3))
-         {
-@@ -138,7 +140,10 @@ AcpiDmProcessSwitch (
-         {
-             /* Note, if we get here Temp is not NULL */
- 
--            if (!strncmp(Temp, (char *) (&Current->Op->Named.Name), 4))
-+   	    ACPI_MOVE_32_TO_32(&Tmp32, &Current->Op->Named.Name);
-+
-+            /* if (!strncmp(Temp, (char *) (&Current->Op->Named.Name), 4)) */
-+            if (!strncmp(Temp, (char *) &Tmp32, 4))
-             {
-                 /* Match found. Ignore disassembly */
- 
diff --git a/converterSample.asl.result b/converterSample.asl.result
deleted file mode 100644
index fd63f11..0000000
--- a/converterSample.asl.result
+++ /dev/null
@@ -1,24 +0,0 @@
-converterSample.asl     37:     Method(MAIN) {
-Remark   2120 -                          ^ Control Method should be made Serialized (due to creation of named objects within)
-
-converterSample.asl     48:             Name(b,0);
-Remark   2089 -    Object is not referenced ^  (Name [B___] is within a method [MAIN])
-
-converterSample.asl     65:     Method(SCOP)
-Remark   2120 -                          ^ Control Method should be made Serialized (due to creation of named objects within)
-
-converterSample.asl     68:         Name (a1, 0x04)
-Remark   2089 -  Object is not referenced ^  (Name [A1__] is within a method [SCOP])
-
-converterSample.asl     76:         Offset(0),//c37
-Remark   2158 -                           ^ Unnecessary/redundant use of Offset operator
-
-
-Intel ACPI Component Architecture
-ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2019 Intel Corporation
-
-ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
-AML Output:    converterSample.aml -     180 bytes      2 opcodes       9 named objects
-
-Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded
diff --git a/f23-harden.patch b/f23-harden.patch
deleted file mode 100644
index 2891d9b..0000000
--- a/f23-harden.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Introduce build hardening flags for f23
-
-From: Al Stone <ahs3@redhat.com>
-
-
----
- generate/unix/Makefile.config |    2 ++
- generate/unix/iasl/Makefile   |   13 +++++++------
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20180209/generate/unix/Makefile.config
-===================================================================
---- acpica-unix2-20180209.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20180209/generate/unix/Makefile.config
-@@ -182,6 +182,8 @@ ifneq ($(NOFORTIFY),TRUE)
- OPT_CFLAGS += -D_FORTIFY_SOURCE=2
- endif
- 
-+OPT_CFLAGS += -fPIC -pie
-+
- CFLAGS += \
-     -D$(HOST)\
-     -D_GNU_SOURCE\
-Index: acpica-unix2-20180209/generate/unix/iasl/Makefile
-===================================================================
---- acpica-unix2-20180209.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20180209/generate/unix/iasl/Makefile
-@@ -344,26 +344,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
- # Cannot use the common compile warning flags since the C files are created
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
-+HARDENING_FLAGS = -fPIC -pie
- $(OBJDIR)/aslcompilerlex.o :   $(OBJDIR)/aslcompilerlex.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/dtparserlex.o :      $(OBJDIR)/dtparserlex.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/dtparserparse.o :    $(OBJDIR)/dtparserparse.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/prparserlex.o :      $(OBJDIR)/prparserlex.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/prparserparse.o :    $(OBJDIR)/prparserparse.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
diff --git a/facp.patch b/facp.patch
deleted file mode 100644
index 8b6bef7..0000000
--- a/facp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7670c56ebe004e698551635f9c5d48a1794066dd Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@ahs3.net>
-Date: Wed, 19 Dec 2018 16:52:41 -0700
-Subject: [PATCH] Correct DSDT Address field in FACP tables
-
-The FADT allows either the DSDT Address or XDSDT Address field to be
-zero.  However, the table definition used by the table compiler still
-requires the DSDT Address to be non-zero, which is not correct.  So,
-remove the DT_NON_ZERO flag from the field.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbinfo.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/common/dmtbinfo.c b/source/common/dmtbinfo.c
-index 2e1c54f84..07d3ce099 100644
---- a/source/common/dmtbinfo.c
-+++ b/source/common/dmtbinfo.c
-@@ -292,7 +292,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoFacs[] =
- ACPI_DMTABLE_INFO           AcpiDmTableInfoFadt1[] =
- {
-     {ACPI_DMT_UINT32,   ACPI_FADT_OFFSET (Facs),                    "FACS Address", 0},
--    {ACPI_DMT_UINT32,   ACPI_FADT_OFFSET (Dsdt),                    "DSDT Address", DT_NON_ZERO},
-+    {ACPI_DMT_UINT32,   ACPI_FADT_OFFSET (Dsdt),                    "DSDT Address", 0},
-     {ACPI_DMT_UINT8,    ACPI_FADT_OFFSET (Model),                   "Model", 0},
-     {ACPI_DMT_FADTPM,   ACPI_FADT_OFFSET (PreferredProfile),        "PM Profile", 0},
-     {ACPI_DMT_UINT16,   ACPI_FADT_OFFSET (SciInterrupt),            "SCI Interrupt", 0},
--- 
-2.20.1
-
diff --git a/grammar.asl.result b/grammar.asl.result
deleted file mode 100644
index bbbf0bd..0000000
--- a/grammar.asl.result
+++ /dev/null
@@ -1,381 +0,0 @@
-ACPI Warning: NsLookup: Type mismatch on GIDX (RegionField), searching for (Region) (20190509/nsaccess-732)
-ACPI Warning: NsLookup: Type mismatch on IDX2 (RegionField), searching for (Region) (20190509/nsaccess-732)
-ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-732)
-ACPI Warning: NsLookup: Type mismatch on AIDX (RegionField), searching for (Region) (20190509/nsaccess-732)
-ACPI Warning: NsLookup: Type mismatch on C05D (RegionField), searching for (Region) (20190509/nsaccess-732)
-ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-732)
-ACPI Warning: NsLookup: Type mismatch on IND2 (RegionField), searching for (Region) (20190509/nsaccess-732)
-grammar.asl    120:     Device (A1)
-Warning  3141 -                 ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    135:     Device (A2)
-Warning  3141 -                 ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    145:     Device (A3)
-Warning  3141 -                 ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    155:     Device (A4)
-Warning  3141 -                 ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    171:     Device (IRES)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    199:     Name (_NPK, Package ()
-Warning  3133 -                 ^ Unknown reserved name (_NPK)
-
-grammar.asl    208:     Device (RES)
-Warning  3141 -                  ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    399:             CreateByteField (PRT0, R000._ASZ, RSIZ)
-Remark   2089 -                            Object is not referenced ^  (Name [RSIZ] is within a method [_CRS])
-
-grammar.asl    513:         Name (_STR, Unicode ("test"))
-Remark   2089 -                     ^ Object is not referenced (Name [_STR] is within a method [TCOP])
-
-grammar.asl    515:         Store (MFLD, Local0)
-Warning  3144 -                              ^ Method Local is set but never used (Local0)
-
-grammar.asl    522:     NAME (ESC1, "abcdefg\x00hijklmn")
-Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
-
-grammar.asl    523:     NAME (ESC2, "abcdefg\000hijklmn")
-Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
-
-grammar.asl    620:         RCIV (Subtract (Arg0, 1))
-Remark   2098 -               ^ Recursive method call (RCIV)
-
-grammar.asl    668:     Method(SMWE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg0)
-
-grammar.asl    668:     Method(SMWE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg1)
-
-grammar.asl    668:     Method(SMWE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg2)
-
-grammar.asl    668:     Method(SMWE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg3)
-
-grammar.asl    673:     Method(SMRE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg0)
-
-grammar.asl    673:     Method(SMRE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg1)
-
-grammar.asl    673:     Method(SMRE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg2)
-
-grammar.asl    673:     Method(SMRE, 4)
-Remark   2146 -                  ^ Method Argument is never used (Arg3)
-
-grammar.asl    701:             CreateField (\_SB_.SBUF, 148, 96, FLDV)
-Remark   2089 -                            Object is not referenced ^  (Name [FLDV] is within a method [_INI])
-
-grammar.asl    733:             Method(_SRS)
-Warning  3102 -                          ^ Reserved method has too few arguments (_SRS requires 1)
-
-grammar.asl    738:             Device(EIO)
-Warning  3141 -      Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    822:                     If(LNot(SMRE(0x09,0x17,Local2,RefOf(Local3)))){
-Warning  3144 -                              Method Local is set but never used ^  (Local3)
-
-grammar.asl    913:     Device (DEV1)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl    963:         Divide (Local0, Local1, Local3)
-Warning  3144 -      Method Local is set but never used ^  (Local3)
-
-grammar.asl    988:     Method (R226, 2)
-Remark   2146 -                   ^ Method Argument is never used (Arg0)
-
-grammar.asl    988:     Method (R226, 2)
-Remark   2146 -                   ^ Method Argument is never used (Arg1)
-
-grammar.asl   1011:         Store (Local0, Local1)
-Warning  3144 -                                ^ Method Local is set but never used (Local1)
-
-grammar.asl   1296:     Method (OBJ1, 1, SERIALIZED)
-Remark   2146 -                   ^ Method Argument is never used (Arg0)
-
-grammar.asl   1300:         Name(BUFR, Buffer (Local0) {})
-Remark   2089 -                    ^ Object is not referenced (Name [BUFR] is within a method [OBJ1])
-
-grammar.asl   1307:         Alias (MTX1, MTX2)
-Remark   2089 -   Object is not referenced ^  (Name [MTX2] is within a method [OBJ1])
-
-grammar.asl   1329:         CreateField (BUF2, 148, 96, FLD3)
-Remark   2089 -                  Object is not referenced ^  (Name [FLD3] is within a method [FLDS])
-
-grammar.asl   1394:         Store (0x1234567887654321, QWD2)
-Warning  3038 -                                    ^ Truncating 64-bit constant found in 32-bit table
-
-grammar.asl   1396:         if (LNotEqual (Local0, 0x1234567887654321))
-Warning  3038 -   Truncating 64-bit constant found in 32-bit table ^ 
-
-grammar.asl   1476:         SizeOf (BUFO)
-Error    6114 -                       ^ Result is not used, operator has no effect
-
-grammar.asl   1496:         Alias (MTX2, MTXA)
-Remark   2089 -   Object is not referenced ^  (Name [MTXA] is within a method [OBJ2])
-
-grammar.asl   1502:         Acquire (MTX2, 1)
-Warning  3130 -                           ^ Result is not used, possible operator timeout will be missed
-
-grammar.asl   1650:         Add (Local0, Local1)
-Error    6114 -                      ^ Result is not used, operator has no effect
-
-grammar.asl   1661:         Add (Local0, Local1, Local2)
-Warning  3144 -   Method Local is set but never used ^  (Local2)
-
-grammar.asl   1777:         Store (LAnd (0xFFFFFFFF, 0x11111111), Local0)
-Warning  3144 -                    Method Local is set but never used ^  (Local0)
-
-grammar.asl   1780:         Store (LEqual (0xFFFFFFFF, 0x11111111), Local1)
-Warning  3144 -                      Method Local is set but never used ^  (Local1)
-
-grammar.asl   1783:         Store (LGreater (0xFFFFFFFF, 0x11111111), Local2)
-Warning  3144 -                        Method Local is set but never used ^  (Local2)
-
-grammar.asl   1786:         Store (LGreaterEqual (0xFFFFFFFF, 0x11111111), Local3)
-Warning  3144 -                             Method Local is set but never used ^  (Local3)
-
-grammar.asl   1789:         Store (LLess (0xFFFFFFFF, 0x11111111), Local4)
-Warning  3144 -                     Method Local is set but never used ^  (Local4)
-
-grammar.asl   1792:         Store (LLessEqual (0xFFFFFFFF, 0x11111111), Local5)
-Warning  3144 -                          Method Local is set but never used ^  (Local5)
-
-grammar.asl   1821:     Method (COND)
-Warning  3115 -                   ^ Not all control paths return a value (COND)
-
-grammar.asl   1930:         Store (RefOf (MAIN), Local5)
-Warning  3144 -   Method Local is set but never used ^  (Local5)
-
-grammar.asl   2005:     Device (IFEL)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2162:     Device (NOSV)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2583:     Device (IDXF)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2611:             Store (IFE0, Local0)
-Warning  3144 -                                  ^ Method Local is set but never used (Local0)
-
-grammar.asl   2612:             Store (IFE1, Local1)
-Warning  3144 -                                  ^ Method Local is set but never used (Local1)
-
-grammar.asl   2613:             Store (IFE2, Local2)
-Warning  3144 -                                  ^ Method Local is set but never used (Local2)
-
-grammar.asl   2630:         Device (NSTL)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2658:     Device (RTBF)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2756:     Device (GPE2)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2771:     Device (PRW2)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2819:     Device (PRW1)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2886:             Store (Arg0, Local0)
-Warning  3144 -                                  ^ Method Local is set but never used (Local0)
-
-grammar.asl   2889:         Device (RTLV)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   2993:             Name (_CRS,0)
-Error    6105 -                           ^ Invalid object type for reserved name (_CRS: found Integer, Buffer required)
-
-grammar.asl   3017:         Device (RETP)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   3053:     Device (WHLR)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   3109:     Device (ANDO)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   3383:     Device (BRKP)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   3420:     Device (ADSU)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   3513:     Device (INDC)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   3611:     Device (LOPS)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   3956:     Device (FDSO)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   4120:     Device (MLDV)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   4253:     Device (NBIT)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   4489:     Device (SHFT)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   4685:     Device (XORD)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   5022:     Device (CRBF)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   5100:     Device (IDX4)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   5639:     Device (EVNT)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   5867:     Device (SZLV)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   5960:         Device (BYTF)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   5970:         Device (C005)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   5972:             Device (C013)
-Warning  3141 -        Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6027:             Name (_HID, "*PNP0A06")
-Error    6061 -            Invalid leading asterisk ^  (*PNP0A06)
-
-grammar.asl   6166:         Name (C18C, Package (2)
-Remark   2063 -                                 ^ Initializer list shorter than declared package length
-
-grammar.asl   6190:         Device (C19B)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6199:                 Divide (Local1, 10, Local0, Local2) //  Local0 = Local1 / 10
-Warning  3144 -          Method Local is set but never used ^  (Local0)
-
-grammar.asl   6244:     Device (DWDF)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6276:     Method (MKW_, 2)
-Remark   2146 -                   ^ Method Argument is never used (Arg0)
-
-grammar.asl   6276:     Method (MKW_, 2)
-Remark   2146 -                   ^ Method Argument is never used (Arg1)
-
-grammar.asl   6285:     Device (DVAX)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6328:     Device (IDX6)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6352:         Device (TST_)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6371:             Store (IFE0, Local0)
-Warning  3144 -                                  ^ Method Local is set but never used (Local0)
-
-grammar.asl   6372:             Store (IFE1, Local1)
-Warning  3144 -                                  ^ Method Local is set but never used (Local1)
-
-grammar.asl   6373:             Store (IFE2, Local2)
-Warning  3144 -                                  ^ Method Local is set but never used (Local2)
-
-grammar.asl   6376:             Store (\IDX6.IFE0, Local3)
-Warning  3144 -     Method Local is set but never used ^  (Local3)
-
-grammar.asl   6377:             Store (\IDX6.IFE1, Local4)
-Warning  3144 -     Method Local is set but never used ^  (Local4)
-
-grammar.asl   6379:             Store (\IDX6.TST_.IFE0, Local5)
-Warning  3144 -          Method Local is set but never used ^  (Local5)
-
-grammar.asl   6380:             Store (\IDX6.TST_.IFE1, Local6)
-Warning  3144 -          Method Local is set but never used ^  (Local6)
-
-grammar.asl   6393:     Device (IDX5)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6478:             Name (_CRS, Buffer(26)  {"\_SB_.PCI2._CRS..........."})
-Warning  3046 -        Invalid or unknown escape sequence ^ 
-
-grammar.asl   6709:         Device (BITI)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   6817:                 And (Local0, 1, Local0) //  Local0 &= 1
-Error    6066 -                              ^ Method local variable is not initialized (Local0)
-
-grammar.asl   6903:             Name (_HID, "*PNP0C0A")     //  Control Method Battey ID
-Error    6061 -            Invalid leading asterisk ^  (*PNP0C0A)
-
-grammar.asl   6912:         Device (IDX3)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   7057:     Device(IDX7)
-Warning  3141 -                  ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   7736:     Device (MTCH)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   7757:             CreateDWordField (TMD0, 4, DMA0)
-Remark   2089 -                     Object is not referenced ^  (Name [DMA0] is within a method [TEST])
-
-grammar.asl   7758:             CreateDWordField (TMD0, 8, PIO1)
-Remark   2089 -                     Object is not referenced ^  (Name [PIO1] is within a method [TEST])
-
-grammar.asl   7759:             CreateDWordField (TMD0, 12, DMA1)
-Remark   2089 -                      Object is not referenced ^  (Name [DMA1] is within a method [TEST])
-
-grammar.asl   7760:             CreateDWordField (TMD0, 16, CHNF)
-Remark   2089 -                      Object is not referenced ^  (Name [CHNF] is within a method [TEST])
-
-grammar.asl   7934:     Device (WHLB)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   8295:         Device (IDX2)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   8678:     Device (SIZO)
-Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   8720:             Name (PKG2, Package (4)
-Remark   2063 -                                     ^ Initializer list shorter than declared package length
-
-grammar.asl   9132:             Store (_OS, Local0)
-Warning  3144 -                                 ^ Method Local is set but never used (Local0)
-
-grammar.asl   9262:         Device (MBIT)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   9273:         Device (MWRD)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   9281:         Device (MBYT)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   9354:         Device (SMIS)
-Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-grammar.asl   9408:         Device(CNDT)
-Warning  3141 -   Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
-
-
-Intel ACPI Component Architecture
-ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2019 Intel Corporation
-
-Ignoring all errors, forcing AML file generation
-
-ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
-AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
-
-Compilation successful. 6 Errors, 88 Warnings, 27 Remarks, 1106 Optimizations
diff --git a/iasl.1 b/iasl.1
deleted file mode 100644
index 1938c7b..0000000
--- a/iasl.1
+++ /dev/null
@@ -1,231 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH IASL 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-iasl \- ACPI Source Language compiler/decompiler
-.SH SYNOPSIS
-.B iasl
-.RI [ <option> ... ]
-.RI <input-file>
-.B ...
-.SH DESCRIPTION
-This manual page briefly documents the
-.B iasl
-command. The option list is taken from the iasl interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B iasl
-is an ASL compiler and decompiler.  This command provides both the ability
-to translate one or more ASL source files to their corresponding AML binary
-files, and the ability to translate AML binary files back to readable
-ASL source.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-.SS Global
-.TP
-.B \-@ <file>
-Specify command file
-.TP
-.B \-I <dir>
-Specify additional include directory
-.TP
-.B \-T <sig>|ALL|*
-Create table template file for ACPI <sig>
-.TP
-.B \-v
-Display compiler version
-
-.PP
-.SS Preprocessor
-.TP
-.B \-D <symbol>
-Define sybol for preprocessor use
-.TP
-.B \-li
-Create prepocessed output file (*.i)
-.TP
-.B \-P
-Preprocess only and create preprocessor output file (*.i)
-.TP
-.B \-Pn
-Disable preprocessor
-
-.PP
-.SS General Output
-.TP
-.B \-p <prefix>
-Specify path/filename prefix for all output files
-.TP
-.B \-va
-Disable all errors and warnings (summary only)
-.TP
-.B \-vi
-Less verbose errors and warnings for use with IDEs
-.TP
-.B \-vo
-Enable optimization comments
-.TP
-.B \-vr
-Disable remarks
-.TP
-.B \-vs
-Disable signon
-.TP
-.B \-w{1|2|3}
-Set warning reporting level
-.TP
-.B \-we
-Report warnings as errors
-
-.PP
-.SS AML and Data Output Files
-.TP
-.B \-s{a|c}
-Create assembler or C source file (*.asm or *.c)
-.TP
-.B \-i{a|c}
-Create assembler or C include file (*.inc or *.h)
-.TP
-.B \-t{a|c|s}
-Create assembler, C, or ASL hex table (*.hex)
-
-.PP
-.SS AML Code Generation
-.TP
-.B \-oa
-Disable all optimizations (compatibility mode)
-.TP
-.B \-of
-Disable constant folding
-.TP
-.B \-oi
-Disable integer optimization to Zero/One/Ones
-.TP
-.B \-on
-Disable named reference string optimization
-.TP
-.B \-cr
-Disable Resource Descriptor error checking
-.TP
-.B \-in
-Ignore NoOp operators
-.TP
-.B \-r <revision>
-Override table header Revision (1-255)
-
-.PP
-.SS ASL Listing Files
-.TP
-.B \-l
-Create mixed listing file (ASL source and AML) (*.lst)
-.TP
-.B \-ln
-Create namespace file (*.nsp)
-.TP
-.B \-ls
-Create combined source file (expanded includes) (*.src)
-
-.PP
-.SS ACPI Data Tables
-.TP
-.B \-G
-Compile custom table containing generic operators
-.TP
-.B \-vt
-Create verbose templates (full disassembly)
-
-.PP
-.SS AML Disassembler
-.TP
-.B \-d [<file>]
-Disassemble AML to ASL source code file (*.dsl)
-.TP
-.B \-da [<file1>,<file2>]
-Disassemble multiple tables from single namespace
-.TP
-.B \-db
-Do not translate Buffers to Resource Templates
-.TP
-.B \-dc [<file>]
-Disassemble AML and immediately compile it
-.br
-(Obtain DSDT from current system if no input file)
-.TP
-.B \-e [<file1>,<file2>]
-Include ACPI table(s) for external symbol resolution
-.TP
-.B \-g
-Get ACPI tables and write to files (*.dat)
-.TP
-.B \-in
-Ignore NoOp opcodes
-.TP
-.B \-vt
-Dump binary table date in hex format within output file
-
-.PP
-.SS Help
-.TP
-.B \-h
-Additional help and compiler debug options
-.TP
-.B \-hc
-Display operators allowed in constant expressions
-.TP
-.B \-hf
-Display help for output file name generation
-.TP
-.B \-hr
-Display ACPI reserved method names
-.TP
-.B \-ht
-Display currently supported ACPI table names
-
-.PP
-.SS Debug
-.TP
-.B \-b{f|t}
-Create debug file (full or parse tree only) (*.txt)
-.TP
-.B \-f
-Ignore errors, force creation of AML output file(s)
-.TP
-.B \-n
-Parse only, no output generation
-.TP
-.B \-ot
-Display compiles times and statistics
-.TP
-.B \-x <level>
-Set debug level for trace output
-.TP
-.B \-z
-Do not insert new compiler ID for DataTables
-
-.SH AUTHOR
-iasl was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Mattia Dongili <malattia@debian.org>,
-for the Debian project (but may be used by others).  It was updated for
-the Fedora project by Al Stone <ahs3@redhat.com> (and may also be used
-by others).
diff --git a/int-format.patch b/int-format.patch
deleted file mode 100644
index de10b2d..0000000
--- a/int-format.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-Use proper integer formatting
-
-From: Al Stone <ahs3@redhat.com>
-
-
----
- source/compiler/aslerror.c              |    4 ++--
- source/compiler/aslopt.c                |    2 +-
- source/compiler/aslprepkg.c             |    2 +-
- source/components/debugger/dbexec.c     |    2 +-
- source/components/dispatcher/dsmthdat.c |    4 ++--
- source/components/dispatcher/dsutils.c  |    2 +-
- source/components/dispatcher/dswscope.c |    4 ++--
- source/components/events/evgpe.c        |    4 ++--
- source/components/executer/exdump.c     |    2 +-
- source/components/executer/exfldio.c    |    4 ++--
- source/components/executer/exnames.c    |    4 ++--
- source/components/hardware/hwregs.c     |    2 +-
- source/components/tables/tbfadt.c       |    6 +++---
- source/components/tables/tbxfroot.c     |    6 +++---
- source/components/utilities/utownerid.c |    2 +-
- 18 files changed, 28 insertions(+), 28 deletions(-)
-
-Index: acpica-unix-20190405/source/compiler/aslerror.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslerror.c
-+++ acpica-unix-20190405/source/compiler/aslerror.c
-@@ -906,7 +906,7 @@ AslLogNewError (
-     AslGbl_ExceptionCount[ModifiedLevel]++;
-     if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
-     {
--        printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT);
-+        printf ("\nMaximum error count (%d) exceeded\n", ASL_MAX_ERROR_COUNT);
- 
-         AslGbl_SourceLine = 0;
-         AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix-20190405/source/compiler/aslopt.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslopt.c
-+++ acpica-unix-20190405/source/compiler/aslopt.c
-@@ -583,7 +583,7 @@ OptOptimizeNamePath (
-     }
- 
-     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
--        "PATH OPTIMIZE: Line %5d ParentOp [%12.12s] ThisOp [%12.12s] ",
-+        "PATH OPTIMIZE: Line %5u ParentOp [%12.12s] ThisOp [%12.12s] ",
-         Op->Asl.LogicalLineNumber,
-         AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
-         AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix-20190405/source/compiler/aslprepkg.c
-===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslprepkg.c
-+++ acpica-unix-20190405/source/compiler/aslprepkg.c
-@@ -309,7 +309,7 @@ ApCheckPackage (
- 
-         if (Count & 1)
-         {
--            sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %d, must be even.",
-+            sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %u, must be even.",
-                 Predefined->Info.Name, Count);
- 
-             AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix-20190405/source/components/debugger/dbexec.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/debugger/dbexec.c
-+++ acpica-unix-20190405/source/components/debugger/dbexec.c
-@@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
-             ACPI_ERROR ((AE_INFO,
-                 "Possible buffer overflow within AML Debugger "
-                 "buffer (size 0x%X needed 0x%X)",
--                ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
-+                (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
-         }
-     }
- 
-Index: acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
-@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
-         if (Index > ACPI_METHOD_MAX_LOCAL)
-         {
-             ACPI_ERROR ((AE_INFO,
--                "Local index %u is invalid (max %u)",
-+                "Local index %u is invalid (max %d)",
-                 Index, ACPI_METHOD_MAX_LOCAL));
-             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
-         }
-@@ -306,7 +306,7 @@ AcpiDsMethodDataGetNode (
-         if (Index > ACPI_METHOD_MAX_ARG)
-         {
-             ACPI_ERROR ((AE_INFO,
--                "Arg index %u is invalid (max %u)",
-+                "Arg index %u is invalid (max %d)",
-                 Index, ACPI_METHOD_MAX_ARG));
-             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
-         }
-Index: acpica-unix-20190405/source/components/dispatcher/dsutils.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20190405/source/components/dispatcher/dsutils.c
-@@ -786,7 +786,7 @@ AcpiDsCreateOperands (
-     }
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
--        "NumOperands %d, ArgCount %d, Index %d\n",
-+        "NumOperands %d, ArgCount %u, Index %u\n",
-         WalkState->NumOperands, ArgCount, Index));
- 
-     /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix-20190405/source/components/dispatcher/dswscope.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix-20190405/source/components/dispatcher/dswscope.c
-@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
-     WalkState->ScopeDepth++;
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
--        "[%.2d] Pushed scope ", (UINT32) WalkState->ScopeDepth));
-+        "[%.2d] Pushed scope ", WalkState->ScopeDepth));
- 
-     OldScopeInfo = WalkState->ScopeInfo;
-     if (OldScopeInfo)
-@@ -211,7 +211,7 @@ AcpiDsScopeStackPop (
-     WalkState->ScopeDepth--;
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
--        "[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
-+        "[%.2u] Popped scope [%4.4s] (%s), New scope -> ",
-         (UINT32) WalkState->ScopeDepth,
-         AcpiUtGetNodeName (ScopeInfo->Scope.Node),
-         AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix-20190405/source/components/events/evgpe.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/events/evgpe.c
-+++ acpica-unix-20190405/source/components/events/evgpe.c
-@@ -489,7 +489,7 @@ AcpiEvGpeDetect (
-                     "Ignore disabled registers for GPE %02X-%02X: "
-                     "RunEnable=%02X, WakeEnable=%02X\n",
-                     GpeRegisterInfo->BaseGpeNumber,
--                    GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
-+                    (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
-                     GpeRegisterInfo->EnableForRun,
-                     GpeRegisterInfo->EnableForWake));
-                 continue;
-Index: acpica-unix-20190405/source/components/executer/exdump.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/executer/exdump.c
-+++ acpica-unix-20190405/source/components/executer/exdump.c
-@@ -678,7 +678,7 @@ AcpiExDumpOperand (
-     if (Depth > 0)
-     {
-         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p Refs=%u ",
--            Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
-+            (int) Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
-     }
-     else
-     {
-Index: acpica-unix-20190405/source/components/executer/exfldio.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/executer/exfldio.c
-+++ acpica-unix-20190405/source/components/executer/exfldio.c
-@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
- 
-             ACPI_ERROR ((AE_INFO,
-                 "Unknown UpdateRule value: 0x%X",
--                (ObjDesc->CommonField.FieldFlags &
--                    AML_FIELD_UPDATE_RULE_MASK)));
-+                (unsigned int) (ObjDesc->CommonField.FieldFlags &
-+                                   AML_FIELD_UPDATE_RULE_MASK)));
-             return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
-         }
-     }
-Index: acpica-unix-20190405/source/components/executer/exnames.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/executer/exnames.c
-+++ acpica-unix-20190405/source/components/executer/exnames.c
-@@ -237,7 +237,7 @@ AcpiExNameSegment (
-          */
-         ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-             "Leading character is not alpha: %02Xh (not a name)\n",
--            CharBuf[0]));
-+            (unsigned int) CharBuf[0]));
-         Status = AE_CTRL_PENDING;
-     }
-     else
-@@ -249,7 +249,7 @@ AcpiExNameSegment (
-         Status = AE_AML_BAD_NAME;
-         ACPI_ERROR ((AE_INFO,
-             "Bad character 0x%02x in name, at %p",
--            *AmlAddress, AmlAddress));
-+            (unsigned int) (*AmlAddress), AmlAddress));
-     }
- 
-     *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix-20190405/source/components/hardware/hwregs.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20190405/source/components/hardware/hwregs.c
-@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
- 
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
--        ACPI_BITMASK_ALL_FIXED_STATUS,
-+        (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
-         ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
- 
-     LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix-20190405/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20190405/source/components/tables/tbfadt.c
-@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
-         if (!(Flags & ACPI_FADT_GPE_REGISTER))
-         {
-             ACPI_ERROR ((AE_INFO,
--                "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
-+                "%s - 32-bit FADT register is too long (%u bytes, %d bits) "
-                 "to convert to GAS struct - 255 bits max, truncating",
-                 RegisterName, ByteWidth, (ByteWidth * 8)));
-         }
-@@ -304,7 +304,7 @@ AcpiTbSelectAddress (
- 
-         ACPI_BIOS_WARNING ((AE_INFO,
-             "32/64X %s address mismatch in FADT: "
--            "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
-+            "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
-             RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
-             AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
- 
-@@ -628,7 +628,7 @@ AcpiTbConvertFadt (
- 
-                     ACPI_BIOS_WARNING ((AE_INFO,
-                         "32/64X address mismatch in FADT/%s: "
--                        "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
-+                        "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
-                         Name, Address32,
-                         ACPI_FORMAT_UINT64 (Address64->Address),
-                         AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix-20190405/source/components/tables/tbxfroot.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix-20190405/source/components/tables/tbxfroot.c
-@@ -177,7 +177,7 @@ AcpiFindRootPointer (
-     {
-         ACPI_ERROR ((AE_INFO,
-             "Could not map memory at 0x%8.8X for length %u",
--            ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
-+            (UINT32) ACPI_EBDA_PTR_LOCATION, (UINT32) ACPI_EBDA_PTR_LENGTH));
- 
-         return_ACPI_STATUS (AE_NO_MEMORY);
-     }
-@@ -204,7 +204,7 @@ AcpiFindRootPointer (
-         {
-             ACPI_ERROR ((AE_INFO,
-                 "Could not map memory at 0x%8.8X for length %u",
--                PhysicalAddress, ACPI_EBDA_WINDOW_SIZE));
-+                PhysicalAddress, (UINT32) ACPI_EBDA_WINDOW_SIZE));
- 
-             return_ACPI_STATUS (AE_NO_MEMORY);
-         }
-@@ -236,7 +236,7 @@ AcpiFindRootPointer (
-     {
-         ACPI_ERROR ((AE_INFO,
-             "Could not map memory at 0x%8.8X for length %u",
--            ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
-+            (UINT32) ACPI_HI_RSDP_WINDOW_BASE, (UINT32) ACPI_HI_RSDP_WINDOW_SIZE));
- 
-         return_ACPI_STATUS (AE_NO_MEMORY);
-     }
-Index: acpica-unix-20190405/source/components/utilities/utownerid.c
-===================================================================
---- acpica-unix-20190405.orig/source/components/utilities/utownerid.c
-+++ acpica-unix-20190405/source/components/utilities/utownerid.c
-@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
-     else
-     {
-         ACPI_ERROR ((AE_INFO,
--            "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1));
-+            "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
-     }
- 
-     (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
diff --git a/mips-be-fix.patch b/mips-be-fix.patch
deleted file mode 100644
index 20b1302..0000000
--- a/mips-be-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: acpica-unix-20190329/source/compiler/aslparseop.c
-===================================================================
---- acpica-unix-20190329.orig/source/compiler/aslparseop.c
-+++ acpica-unix-20190329/source/compiler/aslparseop.c
-@@ -283,7 +283,16 @@ TrCreateValuedLeafOp (
- 
- 
-     Op = TrAllocateOp (ParseOpcode);
--    Op->Asl.Value.Integer = Value;
-+    if (ParseOpcode == PARSEOP_NAMESTRING ||
-+        ParseOpcode == PARSEOP_NAMESEG ||
-+        ParseOpcode == PARSEOP_STRING_LITERAL)
-+    {
-+        Op->Asl.Value.String = (char *) Value;
-+    }
-+    else
-+    {
-+        Op->Asl.Value.Integer = Value;
-+    }
- 
-     DbgPrint (ASL_PARSE_OUTPUT,
-         "\nCreateValuedLeafOp  Ln/Col %u/%u NewOp %p  "
-Index: acpica-unix-20190329/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix-20190329.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190329/source/include/platform/aclinux.h
-@@ -232,10 +232,8 @@
- #endif
- 
- #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
--#if defined(__PPC64__) || defined(__s390x__)
- #define ACPI_BIG_ENDIAN
- #endif
--#endif
- 
- #endif /* __KERNEL__ */
- 
diff --git a/ppc64le.patch b/ppc64le.patch
deleted file mode 100644
index 4cb1e50..0000000
--- a/ppc64le.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: acpica-unix-20190329/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix-20190329.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190329/source/include/platform/aclinux.h
-@@ -233,9 +233,11 @@
- #define __cdecl
- #endif
- 
-+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #if defined(__PPC64__) || defined(__s390x__)
- #define ACPI_BIG_ENDIAN
- #endif
-+#endif
- 
- #endif /* __KERNEL__ */
- 
diff --git a/ptr-cast.patch b/ptr-cast.patch
deleted file mode 100644
index 369d308..0000000
--- a/ptr-cast.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur acpica-unix2-20180209.orig/source/components/tables/tbutils.c acpica-unix2-20180209/source/components/tables/tbutils.c
---- acpica-unix2-20180209.orig/source/components/tables/tbutils.c	2018-03-15 16:47:21.831526264 -0600
-+++ acpica-unix2-20180209/source/components/tables/tbutils.c	2018-03-15 16:58:20.030097284 -0600
-@@ -238,9 +238,11 @@
-          * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
-          *  return 64-bit
-          */
--	Address64 = (UINT64) TableEntry;
- 
- #if ACPI_MACHINE_WIDTH == 32
-+	UINT32 Tmp32 = (UINT32) TableEntry;
-+
-+	Address64 = (UINT64) Tmp32;
-         if (Address64 > ACPI_UINT32_MAX)
-         {
-             /* Will truncate 64-bit address to 32 bits, issue warning */
-@@ -250,9 +252,15 @@
-                 " truncating",
-                 ACPI_FORMAT_UINT64 (Address64)));
-         }
--#endif
-+
-+        return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-+            UINT32, TableEntry)));
-+#else
-+	Address64 = (UINT64) TableEntry;
-+
-         return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-             UINT64, Address64)));
-+#endif
-     }
- }
- 
-diff -Naur acpica-unix2-20180209.orig/source/compiler/aslparseop.c acpica-unix2-20180209/source/compiler/aslparseop.c
---- acpica-unix2-20180209.orig/source/compiler/aslparseop.c	2018-03-15 17:20:09.844338074 -0600
-+++ acpica-unix2-20180209/source/compiler/aslparseop.c	2018-03-15 17:28:19.570800797 -0600
-@@ -287,7 +287,11 @@
-         ParseOpcode == PARSEOP_NAMESEG ||
-         ParseOpcode == PARSEOP_STRING_LITERAL)
-     {
-+#if ACPI_MACHINE_WIDTH == 32
-+        Op->Asl.Value.String = (char *) (UINT32) Value;
-+#else
-         Op->Asl.Value.String = (char *) Value;
-+#endif
-     }
-     else
-     {
diff --git a/run-misc-tests.sh b/run-misc-tests.sh
deleted file mode 100644
index e16babf..0000000
--- a/run-misc-tests.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-#       run the misc tests: we need to do this in a script since
-#       some of these are expected to fail which would normally cause
-#	the %check step to stop.  however, this is expected behavior.
-#	we are running iasl precisely because we expect it to stop when
-#	presented with faulty ASL.
-#
-#       this script assumes it is in the source 'tests' directory at
-#       start.
-#
-
-set -x
-
-BINDIR="$1"
-VERSION="$2"
-
-# create files to compare against
-$BINDIR/iasl -h
-
-sed -e "s/VVVVVVVV/$VERSION/" \
-    ../badcode.asl.result > misc/badcode.asl.expected
-sed -e "s/VVVVVVVV/$VERSION/" \
-    ../grammar.asl.result > misc/grammar.asl.expected
-sed -e "s/VVVVVVVV/$VERSION/" \
-    ../converterSample.asl.result > misc/converterSample.asl.expected
-
-cd misc
-
-# see if badcode.asl failed as expected
-# NB: the -f option is required so we can see all of the errors
-$BINDIR/iasl -f badcode.asl 2>&1 | tee badcode.asl.actual
-diff badcode.asl.actual badcode.asl.expected >/dev/null 2>&1
-[ $? -eq 0 ] || exit 1
-
-# see if grammar.asl failed as expected
-# NB: the -f option is required so we can see all of the errors
-$BINDIR/iasl -f -of grammar.asl 2>&1 | tee grammar.asl.actual
-diff grammar.asl.actual grammar.asl.expected >/dev/null 2>&1
-[ $? -eq 0 ] || exit 1
-
-# see if converterSample.asl succeeded as expected
-$BINDIR/iasl converterSample.asl 2>&1 | tee converterSample.asl.actual
-diff converterSample.asl.actual converterSample.asl.expected >/dev/null 2>&1
-[ $? -ne 0 ] && exit 1
-
-exit 0
diff --git a/simple-64bit.patch b/simple-64bit.patch
deleted file mode 100644
index b1eaaba..0000000
--- a/simple-64bit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Stop listing all 64bit architectures
- Check __LP64__ instead of maintaining a list of all
- 64bit architectures.
-Author: Adrian Bunk <bunk@debian.org>
-
-Index: acpica-unix-20190329/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix-20190329.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190329/source/include/platform/aclinux.h
-@@ -215,9 +215,7 @@
- #define ACPI_FLUSH_CPU_CACHE()
- #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
- 
--#if defined(__ia64__)    || (defined(__x86_64__) && !defined(__ILP32__)) ||\
--    defined(__aarch64__) || defined(__PPC64__) ||\
--    defined(__s390x__)
-+#if defined(__LP64__)
- #define ACPI_MACHINE_WIDTH          64
- #define COMPILER_DEPENDENT_INT64    long
- #define COMPILER_DEPENDENT_UINT64   unsigned long
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
deleted file mode 100644
index c5907f8..0000000
--- a/str-trunc-warn.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: acpica-unix2-20181003/source/compiler/aslanalyze.c
-===================================================================
---- acpica-unix2-20181003.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20181003/source/compiler/aslanalyze.c
-@@ -355,11 +355,16 @@ AnCheckMethodReturnValue (
-          */
-         if (ThisNodeBtype != 0)
-         {
--            sprintf (AslGbl_MsgBuffer,
-+	     int cnt;
-+	     char *strp;
-+
-+            cnt = asprintf (&strp,
-                 "Method returns [%s], %s operator requires [%s]",
-                 AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2);
- 
--            AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
-+            AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, strp);
-+	     if (cnt > 0)
-+	         free(strp);
-         }
-     }
- }
-Index: acpica-unix2-20181003/source/compiler/aslpredef.c
-===================================================================
---- acpica-unix2-20181003.orig/source/compiler/aslpredef.c
-+++ acpica-unix2-20181003/source/compiler/aslpredef.c
-@@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
-         if (MethodInfo->NumReturnNoValue &&
-             ThisName->Info.ExpectedBtypes)
-         {
-+	     int cnt;
-+	     char *strp;
-+
-             AcpiUtGetExpectedReturnTypes (AslGbl_StringBuffer,
-                 ThisName->Info.ExpectedBtypes);
- 
--            sprintf (AslGbl_MsgBuffer, "%s required for %4.4s",
--                AslGbl_StringBuffer, ThisName->Info.Name);
-+            cnt = asprintf (&strp, "%s required for %4.4s",
-+	        AslGbl_StringBuffer, ThisName->Info.Name);
- 
-             AslError (ASL_WARNING, ASL_MSG_RESERVED_RETURN_VALUE, Op,
--                AslGbl_MsgBuffer);
-+                strp);
-+	     if (cnt > 0)
-+	        free(strp);
-         }
-         break;
-     }
-@@ -698,18 +703,26 @@ TypeErrorExit:
- 
-     AcpiUtGetExpectedReturnTypes (AslGbl_StringBuffer, ExpectedBtypes);
- 
--    if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT)
--    {
--        sprintf (AslGbl_MsgBuffer, "%4.4s: found %s, %s required",
--            PredefinedName, TypeName, AslGbl_StringBuffer);
--    }
--    else
-     {
--        sprintf (AslGbl_MsgBuffer, "%4.4s: found %s at index %u, %s required",
--            PredefinedName, TypeName, PackageIndex, AslGbl_StringBuffer);
-+	 int cnt;
-+	 char *strp;
-+
-+        if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT)
-+        {
-+            cnt = asprintf (&strp, "%4.4s: found %s, %s required",
-+                PredefinedName, TypeName, AslGbl_StringBuffer);
-+        }
-+        else
-+        {
-+            cnt = asprintf (&strp, "%4.4s: found %s at index %u, %s required",
-+                PredefinedName, TypeName, PackageIndex, AslGbl_StringBuffer);
-+        }
-+
-+	 AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, strp);
-+	 if (cnt > 0)
-+	     free(strp);
-     }
- 
--    AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, AslGbl_MsgBuffer);
-     return (AE_TYPE);
- }
- 
-Index: acpica-unix2-20181003/source/compiler/aslwalks.c
-===================================================================
---- acpica-unix2-20181003.orig/source/compiler/aslwalks.c
-+++ acpica-unix2-20181003/source/compiler/aslwalks.c
-@@ -507,15 +507,19 @@ AnOperandTypecheckWalkEnd (
-             else if (!CommonBtypes)
-             {
-                 /* No match -- this is a type mismatch error */
-+		int cnt;
-+		char *strp;
- 
-                 AnFormatBtype (AslGbl_StringBuffer, ThisNodeBtype);
-                 AnFormatBtype (AslGbl_StringBuffer2, RequiredBtypes);
- 
--                sprintf (AslGbl_MsgBuffer, "[%s] found, %s operator requires [%s]",
-+                cnt = asprintf (&strp, "[%s] found, %s operator requires [%s]",
-                     AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2);
- 
-                 AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE,
--                    ArgOp, AslGbl_MsgBuffer);
-+                    ArgOp, strp);
-+		if (cnt > 0)
-+		    free(strp);
-             }
- 
-         NextArgument:
diff --git a/template.patch b/template.patch
deleted file mode 100644
index e8b06f5..0000000
--- a/template.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Add in a needed parameter for a test file template
-
-From: Al Stone <ahs3@redhat.com>
-
-
----
- tests/templates/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: acpica-unix2-20161222/tests/templates/Makefile
-===================================================================
---- acpica-unix2-20161222.orig/tests/templates/Makefile
-+++ acpica-unix2-20161222/tests/templates/Makefile
-@@ -2,7 +2,7 @@
- PROG= templates
- 
- templates :
--	sh templates.sh
-+	sh templates.sh 1
- 
- clean :
- 	rm -f *.asl *.aml *.dsl *.hex diff.log
diff --git a/unaligned.patch b/unaligned.patch
deleted file mode 100644
index 9a729d3..0000000
--- a/unaligned.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Patch carried over from the prior iasl package and updated.  This allows
-for builds on systems requiring aligned memory access. Please see
-http://lists.acpica.org/pipermail/devel/2010-July/000159.html.  Resolves
-BZ#865013 and BZ#856856.
---
-
-Add more platforms to the list of the ones requiring aligned memory access.
-Also fix callsites where wrong assumptions where made in terms of aligment.
-
-Signed-off-by: Mattia Dongili <malattia@linux.it>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- source/components/executer/exoparg2.c |   12 +++++++++---
- source/include/actypes.h              |   26 +++++++++++++-------------
- 3 files changed, 32 insertions(+), 21 deletions(-)
-
-Index: acpica-unix2-20170728/source/components/executer/exoparg2.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/executer/exoparg2.c
-+++ acpica-unix2-20170728/source/components/executer/exoparg2.c
-@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
-     ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-     ACPI_OPERAND_OBJECT     *ReturnDesc1 = NULL;
-     ACPI_OPERAND_OBJECT     *ReturnDesc2 = NULL;
-+    UINT64                  ReturnValue1 = 0;
-+    UINT64                  ReturnValue2 = 0;
-     ACPI_STATUS             Status;
- 
- 
-@@ -206,8 +208,10 @@ AcpiExOpcode_2A_2T_1R (
-         Status = AcpiUtDivide (
-             Operand[0]->Integer.Value,
-             Operand[1]->Integer.Value,
--            &ReturnDesc1->Integer.Value,
--            &ReturnDesc2->Integer.Value);
-+            &ReturnValue1, &ReturnValue2);
-+        ReturnDesc1->Integer.Value = ReturnValue1;
-+        ReturnDesc2->Integer.Value = ReturnValue2;
-+
-         if (ACPI_FAILURE (Status))
-         {
-             goto Cleanup;
-@@ -282,6 +286,7 @@ AcpiExOpcode_2A_1T_1R (
-     ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
-     ACPI_OPERAND_OBJECT     *ReturnDesc = NULL;
-     UINT64                  Index;
-+    UINT64                  ReturnValue = 0;
-     ACPI_STATUS             Status = AE_OK;
-     ACPI_SIZE               Length = 0;
- 
-@@ -327,7 +332,8 @@ AcpiExOpcode_2A_1T_1R (
-             Operand[0]->Integer.Value,
-             Operand[1]->Integer.Value,
-             NULL,
--            &ReturnDesc->Integer.Value);
-+            &ReturnValue);
-+        ReturnDesc->Integer.Value = ReturnValue;
-         break;
- 
-     case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix2-20170728/source/include/actypes.h
-===================================================================
---- acpica-unix2-20170728.orig/source/include/actypes.h
-+++ acpica-unix2-20170728/source/include/actypes.h
-@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
-  */
- #define ACPI_THREAD_ID                  UINT64
- 
-+/*
-+ * In the case of the Itanium Processor Family (IPF), the hardware does not
-+ * support misaligned memory transfers. Set the MISALIGNMENT_NOT_SUPPORTED flag
-+ * to indicate that special precautions must be taken to avoid alignment faults.
-+ * (IA64 or ia64 is currently used by existing compilers to indicate IPF.)
-+ *
-+ * Note: EM64T and other X86-64 processors support misaligned transfers,
-+ * so there is no need to define this flag.
-+ */
-+#if defined (__IA64__) || defined (__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__hppa__) 
-+#define ACPI_MISALIGNMENT_NOT_SUPPORTED
-+#endif
-+
- 
- /*******************************************************************************
-  *
-@@ -170,20 +183,6 @@ typedef UINT64
- #define ACPI_USE_NATIVE_DIVIDE          /* Has native 64-bit integer support */
- #define ACPI_USE_NATIVE_MATH64          /* Has native 64-bit integer support */
- 
--/*
-- * In the case of the Itanium Processor Family (IPF), the hardware does not
-- * support misaligned memory transfers. Set the MISALIGNMENT_NOT_SUPPORTED
-- * flag to indicate that special precautions must be taken to avoid alignment
-- * faults. (IA64 or ia64 is currently used by existing compilers to indicate
-- * IPF.)
-- *
-- * Note: EM64T and other X86-64 processors support misaligned transfers,
-- * so there is no need to define this flag.
-- */
--#if defined (__IA64__) || defined (__ia64__)
--#define ACPI_MISALIGNMENT_NOT_SUPPORTED
--#endif
--
- 
- /*******************************************************************************
-  *