Commit a2f46031 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r353224: 

------------------------------------------------------------------------
r353224 | kamil | 2019-02-05 23:20:25 +0100 (Tue, 05 Feb 2019) | 2 lines

Update the ioctl(2) list in sanitizers with NetBSD 8.99.34

------------------------------------------------------------------------

llvm-svn: 353292
parent 5581990e

compiler-rt/lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc

+3 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct ioctl_desc { 
  const char *name;

};



const unsigned ioctl_table_max = 1202;

const unsigned ioctl_table_max = 1200;

static ioctl_desc ioctl_table[ioctl_table_max];

static unsigned ioctl_table_size = 0;
@@ -298,9 +298,6 @@ static void ioctl_table_fill() { 
  _(IRFRAMETTY_GET_DEVICE, WRITE, sizeof(unsigned int));

  _(IRFRAMETTY_GET_DONGLE, WRITE, sizeof(unsigned int));

  _(IRFRAMETTY_SET_DONGLE, READ, sizeof(unsigned int));

  /* Entries from file: dev/isa/satlinkio.h */

  _(SATIORESET, NONE, 0);

  _(SATIOGID, WRITE, struct_satlink_id_sz);

  /* Entries from file: dev/isa/isvio.h */

  _(ISV_CMD, READWRITE, struct_isv_cmd_sz);

  /* Entries from file: dev/isa/wtreg.h */
@@ -649,8 +646,8 @@ static void ioctl_table_fill() { 
  _(SPKRTUNE, NONE, 0);

  _(SPKRGETVOL, WRITE, sizeof(unsigned int));

  _(SPKRSETVOL, READ, sizeof(unsigned int));

  /* Entries from file: dev/nvmm/nvmm_ioctl.h */

#if 0 /* WIP */

  /* Entries from file: dev/nvmm/nvmm_ioctl.h */

  _(NVMM_IOC_CAPABILITY, WRITE, struct_nvmm_ioc_capability_sz);

  _(NVMM_IOC_MACHINE_CREATE, READWRITE, struct_nvmm_ioc_machine_create_sz);

  _(NVMM_IOC_MACHINE_DESTROY, READ, struct_nvmm_ioc_machine_destroy_sz);
@@ -659,7 +656,7 @@ static void ioctl_table_fill() { 
  _(NVMM_IOC_VCPU_DESTROY, READ, struct_nvmm_ioc_vcpu_destroy_sz);

  _(NVMM_IOC_VCPU_SETSTATE, READ, struct_nvmm_ioc_vcpu_setstate_sz);

  _(NVMM_IOC_VCPU_GETSTATE, READ, struct_nvmm_ioc_vcpu_getstate_sz);

  _(NVMM_IOC_VCPU_INJECT, READWRITE, struct_nvmm_ioc_vcpu_inject_sz);

  _(NVMM_IOC_VCPU_INJECT, READ, struct_nvmm_ioc_vcpu_inject_sz);

  _(NVMM_IOC_VCPU_RUN, READWRITE, struct_nvmm_ioc_vcpu_run_sz);

  _(NVMM_IOC_GPA_MAP, READ, struct_nvmm_ioc_gpa_map_sz);

  _(NVMM_IOC_GPA_UNMAP, READ, struct_nvmm_ioc_gpa_unmap_sz);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc

+0 −5
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
#include <dev/ic/nvmeio.h>

#include <dev/ir/irdaio.h>

#include <dev/isa/isvio.h>

#include <dev/isa/satlinkio.h>

#include <dev/isa/wtreg.h>

#include <dev/iscsi/iscsi_ioctl.h>

#include <dev/nvmm/nvmm_ioctl.h>
@@ -639,7 +638,6 @@ unsigned struct_rf_recon_req_sz = sizeof(rf_recon_req); 
unsigned struct_rio_conf_sz = sizeof(rio_conf);

unsigned struct_rio_interface_sz = sizeof(rio_interface);

unsigned struct_rio_stats_sz = sizeof(rio_stats);

unsigned struct_satlink_id_sz = sizeof(satlink_id);

unsigned struct_scan_io_sz = sizeof(scan_io);

unsigned struct_scbusaccel_args_sz = sizeof(scbusaccel_args);

unsigned struct_scbusiodetach_args_sz = sizeof(scbusiodetach_args);
@@ -1105,9 +1103,6 @@ unsigned IOCTL_IRDA_GET_TURNAROUNDMASK = IRDA_GET_TURNAROUNDMASK; 
unsigned IOCTL_IRFRAMETTY_GET_DEVICE = IRFRAMETTY_GET_DEVICE;

unsigned IOCTL_IRFRAMETTY_GET_DONGLE = IRFRAMETTY_GET_DONGLE;

unsigned IOCTL_IRFRAMETTY_SET_DONGLE = IRFRAMETTY_SET_DONGLE;

unsigned IOCTL_SATIORESET = SATIORESET;

unsigned IOCTL_SATIOGID = SATIOGID;

unsigned IOCTL_SATIOSBUFSIZE = SATIOSBUFSIZE;

unsigned IOCTL_ISV_CMD = ISV_CMD;

unsigned IOCTL_WTQICMD = WTQICMD;

unsigned IOCTL_ISCSI_GET_VERSION = ISCSI_GET_VERSION;

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h

+0 −4
Original line number Diff line number Diff line
@@ -803,7 +803,6 @@ extern unsigned struct_rf_recon_req_sz; 
extern unsigned struct_rio_conf_sz;

extern unsigned struct_rio_interface_sz;

extern unsigned struct_rio_stats_sz;

extern unsigned struct_satlink_id_sz;

extern unsigned struct_scan_io_sz;

extern unsigned struct_scbusaccel_args_sz;

extern unsigned struct_scbusiodetach_args_sz;
@@ -1266,9 +1265,6 @@ extern unsigned IOCTL_IRDA_GET_TURNAROUNDMASK; 
extern unsigned IOCTL_IRFRAMETTY_GET_DEVICE;

extern unsigned IOCTL_IRFRAMETTY_GET_DONGLE;

extern unsigned IOCTL_IRFRAMETTY_SET_DONGLE;

extern unsigned IOCTL_SATIORESET;

extern unsigned IOCTL_SATIOGID;

extern unsigned IOCTL_SATIOSBUFSIZE;

extern unsigned IOCTL_ISV_CMD;

extern unsigned IOCTL_WTQICMD;

extern unsigned IOCTL_ISCSI_GET_VERSION;

compiler-rt/utils/generate_netbsd_ioctls.awk

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ FNR == 1 { 
      $0 ~ /JOY_GET_X_OFFSET/ ||

      $0 ~ /CHIOGPICKER/ ||

      $0 ~ /SLIOCGUNIT/ ||

      $0 ~ /SATIOSBUFSIZE/ ||

      $0 ~ /TUNSLMODE/ ||

      $0 ~ /CBQ_IF_ATTACH/ ||

      $0 ~ /CDNR_IF_ATTACH/ ||