Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/acpica/dist 27 May 2016. Summary of changes...



details:   https://anonhg.NetBSD.org/src/rev/54ea1879897d
branches:  trunk
changeset: 816681:54ea1879897d
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jul 18 17:23:24 2016 +0000

description:
27 May 2016. Summary of changes for version 20160527:

This release is available at https://acpica.org/downloads


1) ACPICA kernel-resident subsystem:

Temporarily reverted the new arbitrary bit length/alignment support in
AcpiHwRead/AcpiHwWrite for the Generic Address Structure. There have been
a number of regressions with the new code that need to be fully resolved
and tested before this support can be finally integrated into ACPICA.
Apologies for any inconveniences these issues may have caused.

The ACPI message macros are not configurable (ACPI_MSG_ERROR,
ACPI_MSG_EXCEPTION, ACPI_MSG_WARNING, ACPI_MSG_INFO, ACPI_MSG_BIOS_ERROR,
and ACPI_MSG_BIOS_WARNING). Lv Zheng.

Fixed a couple of GCC warnings associated with the use of the -Wcast-qual
option. Adds a new return macro, return_STR. Junk-uk Kim.

Example Code and Data Size: These are the sizes for the OS-independent
acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The
debug version of the code includes the debug output trace mechanism and
has a much larger code and data size.

  Current Release:
    Non-Debug Version: 136.8K Code, 51.6K Data, 188.4K Total
    Debug Version:     201.5K Code, 82.2K Data, 283.7K Total
  Previous Release:
    Non-Debug Version: 137.4K Code, 52.6K Data, 190.0K Total
    Debug Version:     200.9K Code, 82.2K Data, 283.1K Total

diffstat:

 sys/external/bsd/acpica/dist/changes.txt                           |  33 ++++++++++
 sys/external/bsd/acpica/dist/compiler/asloptions.c                 |   6 +-
 sys/external/bsd/acpica/dist/debugger/dbobject.c                   |   4 +-
 sys/external/bsd/acpica/dist/disassembler/dmopcode.c               |  11 +++-
 sys/external/bsd/acpica/dist/executer/exfldio.c                    |  15 +++-
 sys/external/bsd/acpica/dist/include/platform/aclinux.h            |   8 ++
 sys/external/bsd/acpica/dist/os_specific/service_layers/osbsdtbl.c |   6 +-
 sys/external/bsd/acpica/dist/tools/acpisrc/asfile.c                |  21 +++---
 sys/external/bsd/acpica/dist/tools/acpisrc/asremove.c              |   1 +
 9 files changed, 86 insertions(+), 19 deletions(-)

diffs (238 lines):

diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/changes.txt
--- a/sys/external/bsd/acpica/dist/changes.txt  Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/changes.txt  Mon Jul 18 17:23:24 2016 +0000
@@ -1,4 +1,37 @@
 ----------------------------------------
+27 May 2016. Summary of changes for version 20160527:
+
+This release is available at https://acpica.org/downloads
+
+
+1) ACPICA kernel-resident subsystem:
+
+Temporarily reverted the new arbitrary bit length/alignment support in 
+AcpiHwRead/AcpiHwWrite for the Generic Address Structure. There have been 
+a number of regressions with the new code that need to be fully resolved 
+and tested before this support can be finally integrated into ACPICA. 
+Apologies for any inconveniences these issues may have caused.
+
+The ACPI message macros are not configurable (ACPI_MSG_ERROR, 
+ACPI_MSG_EXCEPTION, ACPI_MSG_WARNING, ACPI_MSG_INFO, ACPI_MSG_BIOS_ERROR, 
+and ACPI_MSG_BIOS_WARNING). Lv Zheng.
+
+Fixed a couple of GCC warnings associated with the use of the -Wcast-qual 
+option. Adds a new return macro, return_STR. Junk-uk Kim.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 136.8K Code, 51.6K Data, 188.4K Total
+    Debug Version:     201.5K Code, 82.2K Data, 283.7K Total
+  Previous Release:
+    Non-Debug Version: 137.4K Code, 52.6K Data, 190.0K Total
+    Debug Version:     200.9K Code, 82.2K Data, 283.1K Total
+
+----------------------------------------
 22 April 2016. Summary of changes for version 20160422:
 
 1) ACPICA kernel-resident subsystem:
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/compiler/asloptions.c
--- a/sys/external/bsd/acpica/dist/compiler/asloptions.c        Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/asloptions.c        Mon Jul 18 17:23:24 2016 +0000
@@ -541,9 +541,13 @@
 
         case 'e':
 
-            /* Disable External opcode generation */
+            /* iASL: Disable External opcode generation */
 
             Gbl_DoExternals = FALSE;
+
+            /* Disassembler: Emit embedded external operators */
+
+            AcpiGbl_DmEmitExternalOpcodes = TRUE;
             break;
 
         case 'f':
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/debugger/dbobject.c
--- a/sys/external/bsd/acpica/dist/debugger/dbobject.c  Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbobject.c  Mon Jul 18 17:23:24 2016 +0000
@@ -161,10 +161,10 @@
 
     case ACPI_TYPE_STRING:
 
-        AcpiOsPrintf ("(%u) \"%.24s",
+        AcpiOsPrintf ("(%u) \"%.60s",
             ObjDesc->String.Length, ObjDesc->String.Pointer);
 
-        if (ObjDesc->String.Length > 24)
+        if (ObjDesc->String.Length > 60)
         {
             AcpiOsPrintf ("...");
         }
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/disassembler/dmopcode.c
--- a/sys/external/bsd/acpica/dist/disassembler/dmopcode.c      Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/disassembler/dmopcode.c      Mon Jul 18 17:23:24 2016 +0000
@@ -971,7 +971,16 @@
 
     case AML_EXTERNAL_OP:
 
-        break;
+        if (AcpiGbl_DmEmitExternalOpcodes)
+        {
+            AcpiOsPrintf ("/* Opcode 0x15 */ ");
+
+            /* Fallthrough */
+        }
+        else
+        {
+            break;
+        }
 
     default:
 
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/executer/exfldio.c
--- a/sys/external/bsd/acpica/dist/executer/exfldio.c   Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/executer/exfldio.c   Mon Jul 18 17:23:24 2016 +0000
@@ -946,9 +946,20 @@
 
     AccessBitWidth = ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth);
 
-    /* Create the bitmasks used for bit insertion */
+    /*
+     * Create the bitmasks used for bit insertion.
+     * Note: This if/else is used to bypass compiler differences with the
+     * shift operator
+     */
+    if (AccessBitWidth == ACPI_INTEGER_BIT_SIZE)
+    {
+        WidthMask = ACPI_UINT64_MAX;
+    }
+    else
+    {
+        WidthMask = ACPI_MASK_BITS_ABOVE (AccessBitWidth);
+    }
 
-    WidthMask = ACPI_MASK_BITS_ABOVE_64 (AccessBitWidth);
     Mask = WidthMask &
         ACPI_MASK_BITS_BELOW (ObjDesc->CommonField.StartFieldBitOffset);
 
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/include/platform/aclinux.h
--- a/sys/external/bsd/acpica/dist/include/platform/aclinux.h   Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/include/platform/aclinux.h   Mon Jul 18 17:23:24 2016 +0000
@@ -163,6 +163,14 @@
 #define ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetNextFilename
 #define ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCloseDirectory
 
+#define ACPI_MSG_ERROR          KERN_ERR "ACPI Error: "
+#define ACPI_MSG_EXCEPTION      KERN_ERR "ACPI Exception: "
+#define ACPI_MSG_WARNING        KERN_WARNING "ACPI Warning: "
+#define ACPI_MSG_INFO           KERN_INFO "ACPI: "
+
+#define ACPI_MSG_BIOS_ERROR     KERN_ERR "ACPI BIOS Error (bug): "
+#define ACPI_MSG_BIOS_WARNING   KERN_WARNING "ACPI BIOS Warning (bug): "
+
 #else /* !__KERNEL__ */
 
 #include <stdarg.h>
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/os_specific/service_layers/osbsdtbl.c
--- a/sys/external/bsd/acpica/dist/os_specific/service_layers/osbsdtbl.c        Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/os_specific/service_layers/osbsdtbl.c        Mon Jul 18 17:23:24 2016 +0000
@@ -43,7 +43,7 @@
 
 #include "acpidump.h"
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__DragonFly__)
 #include <kenv.h>
 #endif
 #include <unistd.h>
@@ -376,7 +376,7 @@
 OslTableInitialize (
     void)
 {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     char                    Buffer[32];
 #endif
     ACPI_TABLE_HEADER       *MappedTable;
@@ -404,7 +404,7 @@
     {
         Address = Gbl_RsdpBase;
     }
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__DragonFly__)
     else if (kenv (KENV_GET, SYSTEM_KENV, Buffer, sizeof (Buffer)) > 0)
     {
         Address = strtoul (Buffer, NULL, 0);
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/tools/acpisrc/asfile.c
--- a/sys/external/bsd/acpica/dist/tools/acpisrc/asfile.c       Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/tools/acpisrc/asfile.c       Mon Jul 18 17:23:24 2016 +0000
@@ -549,7 +549,8 @@
     ACPI_NATIVE_INT         FileType)
 {
     char                    *Pathname;
-    char                    *OutPathname = NULL;
+    char                    *OutPathname;
+    int                     Status = 0;
 
 
     /* Allocate a file pathname buffer for both source and target */
@@ -575,8 +576,8 @@
 
     if (AsGetFile (Pathname, &Gbl_FileBuffer, &Gbl_FileSize))
     {
-        free (Pathname);
-        return (-1);
+        Status = -1;
+        goto Exit1;
     }
 
     Gbl_HeaderSize = 0;
@@ -619,7 +620,8 @@
             if (!OutPathname)
             {
                 printf ("Could not allocate buffer for file pathnames\n");
-                return (-1);
+                Status = -1;
+                goto Exit2;
             }
 
             strcpy (OutPathname, TargetPath);
@@ -630,17 +632,16 @@
             }
 
             AsPutFile (OutPathname, Gbl_FileBuffer, ConversionTable->Flags);
+            free (OutPathname);
         }
     }
 
+Exit2:
     free (Gbl_FileBuffer);
+
+Exit1:
     free (Pathname);
-    if (OutPathname)
-    {
-        free (OutPathname);
-    }
-
-    return (0);
+    return (Status);
 }
 
 
diff -r 3907627d2ca1 -r 54ea1879897d sys/external/bsd/acpica/dist/tools/acpisrc/asremove.c
--- a/sys/external/bsd/acpica/dist/tools/acpisrc/asremove.c     Mon Jul 18 17:04:29 2016 +0000
+++ b/sys/external/bsd/acpica/dist/tools/acpisrc/asremove.c     Mon Jul 18 17:23:24 2016 +0000
@@ -617,6 +617,7 @@
 
     AsReplaceString ("return_VOID",         "return", REPLACE_WHOLE_WORD, Buffer);
     AsReplaceString ("return_PTR",          "return", REPLACE_WHOLE_WORD, Buffer);
+    AsReplaceString ("return_STR",          "return", REPLACE_WHOLE_WORD, Buffer);
     AsReplaceString ("return_ACPI_STATUS",  "return", REPLACE_WHOLE_WORD, Buffer);
     AsReplaceString ("return_acpi_status",  "return", REPLACE_WHOLE_WORD, Buffer);
     AsReplaceString ("return_VALUE",        "return", REPLACE_WHOLE_WORD, Buffer);



Home | Main Index | Thread Index | Old Index