[Intel-gfx] [igt-dev] [PATCH i-g-t] tools/aubdump: Fix ISO C90 forbids mixed declarations and code warning

[Scott D Phillips]

Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com> writes:

> On 09/04/2018 18:03, Scott D Phillips wrote:
>> Tvrtko Ursulin <tursulin at ursulin.net> writes:
>> 
>>> From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>>>
>>> Back to a clean build with no warnings, at least for me.
>> 
>> Why c90? If that's the language we mean to target then we should
>> probably add it to the build system so people with gcc 5.1 and later
>> will see the warnings too. fwiw, my build with clang 6 gives a couple
>> dozen warnings.
>
> I am building under Ubuntu 17.10 with GCC 7.2.0. Normal configure && 
> make, and get this warning. And since I can't spot that IGT is setting 
> the C standard explicitly, I guess that's the default.

Ah, turns out it's not -std=c90, but an explicit
-Wdeclaration-after-statement that we pick up through
XORG_DEFAULT_OPTIONS. Clang seems to emit that warning only if it's in
c90 mode, which is why I didn't see it. So I'll say

Reviewed-by: Scott D Phillips <scott.d.phillips at intel.com>

> This one is the only warning on my build btw.
>
> Regards,
>
> Tvrtko
>
>>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>>> Cc: Jordan Justen <jordan.l.justen at intel.com>
>>> Cc: Scott D Phillips <scott.d.phillips at intel.com>
>>> ---
>>>   tools/aubdump.c | 7 ++++---
>>>   1 file changed, 4 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/tools/aubdump.c b/tools/aubdump.c
>>> index 267061b0fc2b..2d2b6c607a43 100644
>>> --- a/tools/aubdump.c
>>> +++ b/tools/aubdump.c
>>> @@ -394,10 +394,11 @@ gen8_emit_ggtt_pte_for_range(uint64_t start, uint64_t end)
>>>   
>>>   	entry_addr = start & ~(4096 - 1);
>>>   	do {
>>> +		uint64_t last_page_entry, num_entries;
>>> +
>>>   		page_num = entry_addr >> 21;
>>> -		uint64_t last_page_entry =
>>> -			min((page_num + 1) << 21, end_aligned);
>>> -		uint64_t num_entries = (last_page_entry - entry_addr) >> 12;
>>> +		last_page_entry = min((page_num + 1) << 21, end_aligned);
>>> +		num_entries = (last_page_entry - entry_addr) >> 12;
>>>   		mem_trace_memory_write_header_out(
>>>   			entry_addr >> 9, num_entries * GEN8_PTE_SIZE,
>>>   			AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT_ENTRY);
>>> -- 
>>> 2.14.1
>> _______________________________________________
>> igt-dev mailing list
>> igt-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/igt-dev
>>