Skip to content
Snippets Groups Projects
Commit 6d49874b authored by Andre Maroneze's avatar Andre Maroneze
Browse files

Merge branch 'fix/machdeps-anonstruct' into 'master'

[Kernel] avoid anonymous struct in machdep

See merge request frama-c/frama-c!4870
parents af53690a e0efe123
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ alignof_longlong: 1 ...@@ -9,7 +9,7 @@ alignof_longlong: 1
alignof_ptr: 1 alignof_ptr: 1
alignof_short: 2 alignof_short: 2
alignof_str: 1 alignof_str: 1
max_align_t: struct {int __max_align; } __attribute__ ((aligned (8))) max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (8)))
bufsiz: '1024' bufsiz: '1024'
char_is_unsigned: false char_is_unsigned: false
compiler: clang compiler: clang
......
...@@ -9,7 +9,7 @@ alignof_longlong: 1 ...@@ -9,7 +9,7 @@ alignof_longlong: 1
alignof_ptr: 1 alignof_ptr: 1
alignof_short: 2 alignof_short: 2
alignof_str: 1 alignof_str: 1
max_align_t: struct {int __max_align; } __attribute__ ((aligned (8))) max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (8)))
bufsiz: '1024' bufsiz: '1024'
char_is_unsigned: false char_is_unsigned: false
compiler: clang compiler: clang
......
...@@ -9,7 +9,7 @@ alignof_longlong: 4 ...@@ -9,7 +9,7 @@ alignof_longlong: 4
alignof_ptr: 4 alignof_ptr: 4
alignof_short: 2 alignof_short: 2
alignof_str: 1 alignof_str: 1
max_align_t: struct {int __max_align; } __attribute__ ((aligned (16))) max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
char_is_unsigned: false char_is_unsigned: false
compiler: gcc compiler: gcc
cpp_arch_flags: cpp_arch_flags:
......
...@@ -9,7 +9,7 @@ alignof_longlong: 4 ...@@ -9,7 +9,7 @@ alignof_longlong: 4
alignof_ptr: 4 alignof_ptr: 4
alignof_short: 2 alignof_short: 2
alignof_str: 1 alignof_str: 1
max_align_t: struct {int __max_align; } __attribute__ ((aligned (16))) max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
bufsiz: '8192' bufsiz: '8192'
char_is_unsigned: false char_is_unsigned: false
compiler: gcc compiler: gcc
......
...@@ -9,7 +9,7 @@ alignof_longlong: 4 ...@@ -9,7 +9,7 @@ alignof_longlong: 4
alignof_ptr: 4 alignof_ptr: 4
alignof_short: 2 alignof_short: 2
alignof_str: 1 alignof_str: 1
max_align_t: struct {int __max_align; } __attribute__ ((aligned (16))) max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
char_is_unsigned: false char_is_unsigned: false
compiler: generic compiler: generic
cpp_arch_flags: cpp_arch_flags:
......
...@@ -9,7 +9,7 @@ alignof_longlong: 4 ...@@ -9,7 +9,7 @@ alignof_longlong: 4
alignof_ptr: 4 alignof_ptr: 4
alignof_short: 2 alignof_short: 2
alignof_str: 1 alignof_str: 1
max_align_t: struct {int __max_align; } __attribute__ ((aligned (16))) max_align_t: struct __machdep_max_align_t { int __max_align; } __attribute__ ((aligned (16)))
bufsiz: '8192' bufsiz: '8192'
char_is_unsigned: false char_is_unsigned: false
compiler: generic compiler: generic
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "string.h" #include "string.h"
#include "strings.h" #include "strings.h"
typedef unsigned short byte; typedef unsigned short byte;
union __anonunion_PROPERLY_ALIGNED_TYPE_2 { union __anonunion_PROPERLY_ALIGNED_TYPE_1 {
int a ; int a ;
short b ; short b ;
char c[1] ; char c[1] ;
...@@ -16,23 +16,23 @@ union __anonunion_PROPERLY_ALIGNED_TYPE_2 { ...@@ -16,23 +16,23 @@ union __anonunion_PROPERLY_ALIGNED_TYPE_2 {
float f ; float f ;
double g ; double g ;
}; };
typedef union __anonunion_PROPERLY_ALIGNED_TYPE_2 PROPERLY_ALIGNED_TYPE; typedef union __anonunion_PROPERLY_ALIGNED_TYPE_1 PROPERLY_ALIGNED_TYPE;
union __anonunion_u1_4 { union __anonunion_u1_3 {
PROPERLY_ALIGNED_TYPE dummy ; PROPERLY_ALIGNED_TYPE dummy ;
byte keyschedule[14 + 1][4][4] ; byte keyschedule[14 + 1][4][4] ;
}; };
union __anonunion_u2_5 { union __anonunion_u2_4 {
PROPERLY_ALIGNED_TYPE dummy ; PROPERLY_ALIGNED_TYPE dummy ;
byte keyschedule[14 + 1][4][4] ; byte keyschedule[14 + 1][4][4] ;
}; };
struct __anonstruct_RIJNDAEL_context_3 { struct __anonstruct_RIJNDAEL_context_2 {
union __anonunion_u1_4 u1 ; union __anonunion_u1_3 u1 ;
union __anonunion_u2_5 u2 ; union __anonunion_u2_4 u2 ;
int rounds ; int rounds ;
unsigned int decryption_prepared : 1 ; unsigned int decryption_prepared : 1 ;
unsigned int use_aesni : 1 ; unsigned int use_aesni : 1 ;
}; };
typedef struct __anonstruct_RIJNDAEL_context_3 RIJNDAEL_context; typedef struct __anonstruct_RIJNDAEL_context_2 RIJNDAEL_context;
__inline static void do_aesni_enc(RIJNDAEL_context const *ctx, __inline static void do_aesni_enc(RIJNDAEL_context const *ctx,
unsigned char *b, unsigned char const *a) unsigned char *b, unsigned char const *a)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment