]> git.pld-linux.org Git - packages/acpica.git/blob - ptr-cast.patch
- updated to 20200430
[packages/acpica.git] / ptr-cast.patch
1 Index: acpica-unix-20191213/source/components/tables/tbutils.c
2 ===================================================================
3 --- acpica-unix-20191213.orig/source/components/tables/tbutils.c
4 +++ acpica-unix-20191213/source/components/tables/tbutils.c
5 @@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
6           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
7           *  return 64-bit
8           */
9 -       Address64 = (UINT64) TableEntry;
10  
11  #if ACPI_MACHINE_WIDTH == 32
12 +       UINT32 Tmp32 = (UINT32) TableEntry;
13 +
14 +       Address64 = (UINT64) Tmp32;
15          if (Address64 > ACPI_UINT32_MAX)
16          {
17              /* Will truncate 64-bit address to 32 bits, issue warning */
18 @@ -250,9 +252,15 @@ AcpiTbGetRootTableEntry (
19                  " truncating",
20                  ACPI_FORMAT_UINT64 (Address64)));
21          }
22 -#endif
23 +
24 +        return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
25 +            UINT32, TableEntry)));
26 +#else
27 +       Address64 = (UINT64) TableEntry;
28 +
29          return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
30              UINT64, Address64)));
31 +#endif
32      }
33  }
34  
35 Index: acpica-unix-20191213/source/compiler/aslparseop.c
36 ===================================================================
37 --- acpica-unix-20191213.orig/source/compiler/aslparseop.c
38 +++ acpica-unix-20191213/source/compiler/aslparseop.c
39 @@ -287,7 +287,11 @@ TrCreateValuedLeafOp (
40          ParseOpcode == PARSEOP_NAMESEG ||
41          ParseOpcode == PARSEOP_STRING_LITERAL)
42      {
43 +#if ACPI_MACHINE_WIDTH == 32
44 +        Op->Asl.Value.String = (char *) (UINT32) Value;
45 +#else
46          Op->Asl.Value.String = (char *) Value;
47 +#endif
48      }
49      else
50      {
This page took 0.023764 seconds and 3 git commands to generate.