]> git.pld-linux.org Git - packages/acpica.git/blobdiff - debian-unaligned.patch
projects / packages / acpica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 20170303 with current Fedora patches
[packages/acpica.git] / debian-unaligned.patch
diff --git a/debian-unaligned.patch b/debian-unaligned.patch
index a04214884e46c1b0c0196fb718a3f1c1df3480fd..e6de0bddd0ddd71c532ad29e0f197be6d6f1cb8f 100644 (file)
--- a/debian-unaligned.patch
+++ b/debian-unaligned.patch
@@ -1,4 +1,7 @@
 Patch carried over from the prior iasl package and updated.  This allows
+
+From: Al Stone <ahs3@redhat.com>
+
 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.
@@ -10,17 +13,17 @@ 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/compiler/asltree.c             | 15 ++++++++++-----
- source/components/executer/exoparg2.c | 12 +++++++++---
- source/include/actypes.h              | 26 +++++++++++++-------------
- 3 file modificati, 32 inserzioni(+), 21 rimozioni(-)
+ source/compiler/asltree.c             |   15 ++++++++++-----
+ source/components/executer/exoparg2.c |   12 +++++++++---
+ source/include/actypes.h              |   26 +++++++++++++-------------
+ 3 files changed, 32 insertions(+), 21 deletions(-)
 
-diff --git a/source/compiler/asltree.c b/source/compiler/asltree.c
-index ebf87f3..fd859d7 100644
---- a/source/compiler/asltree.c
-+++ b/source/compiler/asltree.c
-@@ -782,28 +592,31 @@ TrCreateValuedLeafNode (
-         "\nCreateValuedLeafNode  Ln/Col %u/%u NewNode %p  Op %s  Value %8.8X%8.8X  ",
+Index: acpica-unix2-20170224/source/compiler/asltree.c
+===================================================================
+--- acpica-unix2-20170224.orig/source/compiler/asltree.c
++++ acpica-unix2-20170224/source/compiler/asltree.c
+@@ -998,28 +998,31 @@ TrCreateValuedLeafNode (
+         "Op %s  Value %8.8X%8.8X  ",
          Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode),
          ACPI_FORMAT_UINT64 (Value));
 -    Op->Asl.Value.Integer = Value;
@@ -28,53 +31,54 @@ index ebf87f3..fd859d7 100644
      switch (ParseOpcode)
      {
      case PARSEOP_STRING_LITERAL:
-
+ 
 -        DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Value);
 +        Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
 +        DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Op->Asl.Value.String);
          break;
  
      case PARSEOP_NAMESEG:
-
+ 
 -        DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Value);
 +        Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
 +        DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Op->Asl.Value.String);
          break;
  
      case PARSEOP_NAMESTRING:
-
+ 
 -        DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Value);
 +        Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
 +        DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Op->Asl.Value.String);
          break;
  
      case PARSEOP_EISAID:
-
+ 
 -        DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Value);
 +        Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
 +        DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Op->Asl.Value.String);
          break;
  
      case PARSEOP_METHOD:
-@@ -813,11 +622,13 @@ TrCreateValuedLeafNode (
+@@ -1029,12 +1032,14 @@ TrCreateValuedLeafNode (
  
      case PARSEOP_INTEGER:
-
+ 
 +        Op->Asl.Value.Integer = Value;
-         DbgPrint (ASL_PARSE_OUTPUT, "INTEGER");
+         DbgPrint (ASL_PARSE_OUTPUT, "INTEGER->%8.8X%8.8X",
+             ACPI_FORMAT_UINT64 (Value));
          break;
  
      default:
-
+ 
 +        Op->Asl.Value.Integer = Value;
          break;
      }
  
-diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c
-index e55f40c..ed5b1fd 100644
---- a/source/components/executer/exoparg2.c
-+++ b/source/components/executer/exoparg2.c
-@@ -172,6 +176,8 @@ AcpiExOpcode_2A_2T_1R (
+Index: acpica-unix2-20170224/source/components/executer/exoparg2.c
+===================================================================
+--- acpica-unix2-20170224.orig/source/components/executer/exoparg2.c
++++ acpica-unix2-20170224/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;
@@ -83,20 +87,20 @@ index e55f40c..ed5b1fd 100644
      ACPI_STATUS             Status;
  
  
-@@ -205,8 +211,10 @@ AcpiExOpcode_2A_2T_1R (
- 
-         Status = AcpiUtDivide (Operand[0]->Integer.Value,
-                                Operand[1]->Integer.Value,
--                               &ReturnDesc1->Integer.Value,
--                               &ReturnDesc2->Integer.Value);
-+                               &ReturnValue1, &ReturnValue2);
+@@ -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;
-@@ -280,6 +285,7 @@ AcpiExOpcode_2A_1T_1R (
+@@ -282,6 +286,7 @@ AcpiExOpcode_2A_1T_1R (
      ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
      ACPI_OPERAND_OBJECT     *ReturnDesc = NULL;
      UINT64                  Index;
@@ -104,21 +108,21 @@ index e55f40c..ed5b1fd 100644
      ACPI_STATUS             Status = AE_OK;
      ACPI_SIZE               Length = 0;
  
-@@ -323,7 +333,8 @@ AcpiExOpcode_2A_1T_1R (
-         Status = AcpiUtDivide (Operand[0]->Integer.Value,
-                                Operand[1]->Integer.Value,
-                                NULL,
--                               &ReturnDesc->Integer.Value);
-+                               &ReturnValue);
+@@ -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_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */
-diff --git a/source/include/actypes.h b/source/include/actypes.h
-index 07fb7d5..08bdf2f 100644
---- a/source/include/actypes.h
-+++ b/source/include/actypes.h
-@@ -143,6 +156,19 @@ typedef COMPILER_DEPENDENT_INT64        INT64;
+     case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
+Index: acpica-unix2-20170224/source/include/actypes.h
+===================================================================
+--- acpica-unix2-20170224.orig/source/include/actypes.h
++++ acpica-unix2-20170224/source/include/actypes.h
+@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
   */
  #define ACPI_THREAD_ID                  UINT64
  
@@ -138,7 +142,7 @@ index 07fb7d5..08bdf2f 100644
  
  /*******************************************************************************
   *
-@@ -169,19 +182,6 @@ typedef UINT64                          ACPI_PHYSICAL_ADDRESS;
+@@ -169,19 +182,6 @@ typedef UINT64
  #define ACPI_SIZE_MAX                   ACPI_UINT64_MAX
  #define ACPI_USE_NATIVE_DIVIDE          /* Has native 64-bit integer support */
  
@@ -158,6 +162,3 @@ index 07fb7d5..08bdf2f 100644
  
  /*******************************************************************************
   *
--- 
-1.7.12.1
-
ACPI Component Architecture - an assembler and disassembler for DSDT tables
This page took 0.048835 seconds and 4 git commands to generate.