[PATCH] ntoskrnl.exe: Make USD pointers volatile to silent a warning.

[Zebediah Figura]

On 3/29/22 12:39, Rémi Bernon wrote:
> Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
> ---
>   dlls/ntoskrnl.exe/instr.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
> index 8f1aa4d45a3..05976c38b27 100644
> --- a/dlls/ntoskrnl.exe/instr.c
> +++ b/dlls/ntoskrnl.exe/instr.c
> @@ -497,8 +497,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(int);
>   #define SIB_BASE( sib, rex )    (((sib) & 7) | (((rex) & REX_B) ? 8 : 0))
>   
>   /* keep in sync with dlls/ntdll/thread.c:thread_init */
> -static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000;
> -static const BYTE *user_shared_data      = (BYTE *)0xfffff78000000000;
> +static const volatile BYTE *const volatile wine_user_shared_data = (BYTE *)0x7ffe0000;
> +static const volatile BYTE *const volatile user_shared_data      = (BYTE *)0xfffff78000000000;

I might be misunderstanding something, but I don't think "static const 
volatile" makes sense? I.e. the second "volatile" probably shouldn't be 
there.

>   
>   static inline DWORD64 *get_int_reg( CONTEXT *context, int index )
>   {
> @@ -843,7 +843,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
>                   ULONGLONG temp = 0;
>   
>                   TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip);
> -                memcpy( &temp, wine_user_shared_data + offset, data_size );
> +                memcpy( &temp, (BYTE *)wine_user_shared_data + offset, data_size );
>                   store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV );
>                   context->Rip += prefixlen + len + 2;
>                   return ExceptionContinueExecution;
> @@ -869,19 +869,19 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
>               switch (*instr)
>               {
>                   case 0x8a:
> -                    store_reg_byte( context, instr[1], wine_user_shared_data + offset,
> +                    store_reg_byte( context, instr[1], (BYTE *)wine_user_shared_data + offset,
>                               rex, INSTR_OP_MOV );
>                       break;
>                   case 0x8b:
> -                    store_reg_word( context, instr[1], wine_user_shared_data + offset,
> +                    store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset,
>                               long_op, rex, INSTR_OP_MOV );
>                       break;
>                   case 0x0b:
> -                    store_reg_word( context, instr[1], wine_user_shared_data + offset,
> +                    store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset,
>                               long_op, rex, INSTR_OP_OR );
>                       break;
>                   case 0x33:
> -                    store_reg_word( context, instr[1], wine_user_shared_data + offset,
> +                    store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset,
>                               long_op, rex, INSTR_OP_XOR );
>                       break;
>               }
> @@ -902,7 +902,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
>           if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size)
>           {
>               TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip);
> -            memcpy( &context->Rax, wine_user_shared_data + offset, data_size );
> +            memcpy( &context->Rax, (BYTE *)wine_user_shared_data + offset, data_size );
>               context->Rip += prefixlen + len + 1;
>               return ExceptionContinueExecution;
>           }