3
3
4
4
// System headers.
5
5
#include < cassert>
6
+ #include < cinttypes>
6
7
#include < cstdint>
7
8
#include < stdio.h>
8
9
#include < stdlib.h>
9
10
#include < string>
10
11
#include < vector>
11
- #include < cinttypes>
12
12
13
13
// Internal headers.
14
14
#include < acl_auto_configure.h>
@@ -289,8 +289,8 @@ static int acl_kernel_if_read_32b(acl_kernel_if *kern, unsigned int addr,
289
289
r = kern->io .read (&kern->io , (dev_addr_t )addr, (char *)val, (size_t )size);
290
290
if (r < size) {
291
291
kern->io .printf (
292
- " HAL Kern Error: Read failed from addr %x, read %zu expected %zu\n " , addr,
293
- r, size);
292
+ " HAL Kern Error: Read failed from addr %x, read %zu expected %zu\n " ,
293
+ addr, r, size);
294
294
return -1 ;
295
295
}
296
296
return 0 ;
@@ -335,8 +335,8 @@ static int acl_kernel_rom_read_block(acl_kernel_if *kern, unsigned int addr,
335
335
r = kern->io .read (&kern->io , (dev_addr_t )addr, config_rom, (size_t )size);
336
336
if (r < size) {
337
337
kern->io .printf (
338
- " HAL Kern Error: Read failed from addr %x, read %zu expected %zu\n " , addr,
339
- r, size);
338
+ " HAL Kern Error: Read failed from addr %x, read %zu expected %zu\n " ,
339
+ addr, r, size);
340
340
return -1 ;
341
341
}
342
342
return 0 ;
@@ -382,9 +382,10 @@ static int acl_kernel_if_write_64b(acl_kernel_if *kern, unsigned int addr,
382
382
r = (int )kern->io .write (&kern->io , (dev_addr_t )addr, (char *)&val,
383
383
(size_t )size);
384
384
if (r < size) {
385
- kern->io .printf (" HAL Kern Error: Write failed to addr %x with value %" PRIu64 " , "
386
- " wrote %d, expected %d\n " ,
387
- addr, val, r, size);
385
+ kern->io .printf (
386
+ " HAL Kern Error: Write failed to addr %x with value %" PRIu64 " , "
387
+ " wrote %d, expected %d\n " ,
388
+ addr, val, r, size);
388
389
return -1 ;
389
390
}
390
391
return 0 ;
@@ -452,8 +453,8 @@ static uintptr_t acl_kernel_cra_set_segment(acl_kernel_if *kern,
452
453
acl_kernel_if_write_32b (kern, OFFSET_KERNEL_CRA_SEGMENT,
453
454
(unsigned int )segment);
454
455
kern->cur_segment = segment;
455
- acl_kernel_if_read_32b (kern, OFFSET_KERNEL_CRA_SEGMENT,
456
- ( unsigned int *)&segment );
456
+ unsigned int new_segment;
457
+ acl_kernel_if_read_32b (kern, OFFSET_KERNEL_CRA_SEGMENT, &new_segment );
457
458
}
458
459
459
460
return segment_offset;
@@ -469,8 +470,8 @@ static uintptr_t acl_kernel_cra_set_segment_rom(acl_kernel_if *kern,
469
470
acl_kernel_if_write_32b (kern, OFFSET_KERNEL_CRA_SEGMENT,
470
471
(unsigned int )segment);
471
472
kern->cur_segment = segment;
472
- acl_kernel_if_read_32b (kern, OFFSET_KERNEL_CRA_SEGMENT,
473
- ( unsigned int *)&segment );
473
+ unsigned int new_segment;
474
+ acl_kernel_if_read_32b (kern, OFFSET_KERNEL_CRA_SEGMENT, &new_segment );
474
475
}
475
476
476
477
return segment_offset;
@@ -931,10 +932,10 @@ int acl_kernel_if_update(const acl_device_def_autodiscovery_t &devdef,
931
932
OFFSET_KERNEL_CRA + devdef.hal_info [ii].csr .address ;
932
933
kern->accel_csr [ii].bytes = devdef.hal_info [ii].csr .num_bytes ;
933
934
934
- ACL_KERNEL_IF_DEBUG_MSG (kern, " Kernel_%s CSR { 0x%08 " PRIuPTR " , 0x%08 " PRIuPTR " } \n " ,
935
- devdef. accel [ii]. iface . name . c_str () ,
936
- kern->accel_csr [ii].address ,
937
- kern->accel_csr [ii].bytes );
935
+ ACL_KERNEL_IF_DEBUG_MSG (
936
+ kern, " Kernel_%s CSR { 0x%08 " PRIuPTR " , 0x%08 " PRIuPTR " } \n " ,
937
+ devdef. accel [ii]. iface . name . c_str (), kern->accel_csr [ii].address ,
938
+ kern->accel_csr [ii].bytes );
938
939
}
939
940
940
941
// The Kernel performance monitor registers
@@ -943,10 +944,10 @@ int acl_kernel_if_update(const acl_device_def_autodiscovery_t &devdef,
943
944
OFFSET_KERNEL_CRA + devdef.hal_info [ii].perf_mon .address ;
944
945
kern->accel_perf_mon [ii].bytes = devdef.hal_info [ii].perf_mon .num_bytes ;
945
946
946
- ACL_KERNEL_IF_DEBUG_MSG (kern, " Kernel_%s perf_mon { 0x%08 " PRIuPTR " , 0x%08 " PRIuPTR " } \n " ,
947
- devdef. accel [ii]. iface . name . c_str () ,
948
- kern->accel_perf_mon [ii].address ,
949
- kern->accel_perf_mon [ii].bytes );
947
+ ACL_KERNEL_IF_DEBUG_MSG (
948
+ kern, " Kernel_%s perf_mon { 0x%08 " PRIuPTR " , 0x%08 " PRIuPTR " } \n " ,
949
+ devdef. accel [ii]. iface . name . c_str (), kern->accel_perf_mon [ii].address ,
950
+ kern->accel_perf_mon [ii].bytes );
950
951
951
952
// printf info
952
953
kern->accel_num_printfs [ii] =
@@ -1614,8 +1615,9 @@ void acl_kernel_if_update_status(acl_kernel_if *kern) {
1614
1615
acl_kernel_if_write_32b (kern, OFFSET_KERNEL_CRA_SEGMENT,
1615
1616
(unsigned int )segment_pre_irq);
1616
1617
kern->cur_segment = segment_pre_irq;
1618
+ unsigned int new_segment_pre_irq;
1617
1619
acl_kernel_if_read_32b (kern, OFFSET_KERNEL_CRA_SEGMENT,
1618
- ( unsigned int *)&segment_pre_irq );
1620
+ &new_segment_pre_irq );
1619
1621
}
1620
1622
}
1621
1623
0 commit comments