From 178faecb8865888569bc33d7d0e51eca90366b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kowalczyk?= Date: Wed, 3 Jul 2019 00:55:14 +0200 Subject: [PATCH] [PAL] Make PAL_HANDLE flags macros MAX_FDS-aware --- Pal/src/host/FreeBSD/pal_host.h | 10 +++++----- Pal/src/host/Linux-SGX/pal_host.h | 10 +++++----- Pal/src/host/Linux/pal_host.h | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Pal/src/host/FreeBSD/pal_host.h b/Pal/src/host/FreeBSD/pal_host.h index 30653290..ed4689b8 100644 --- a/Pal/src/host/FreeBSD/pal_host.h +++ b/Pal/src/host/FreeBSD/pal_host.h @@ -169,11 +169,11 @@ typedef union pal_handle } event; } * PAL_HANDLE; -#define RFD(n) (00001 << (n)) -#define WFD(n) (00010 << (n)) -#define WRITABLE(n) (00100 << (n)) -#define ERROR(n) (01000 << (n)) -#define HAS_FDS 00077 +#define RFD(n) (1 << (MAX_FDS*0 + (n))) +#define WFD(n) (1 << (MAX_FDS*1 + (n))) +#define WRITABLE(n) (1 << (MAX_FDS*2 + (n))) +#define ERROR(n) (1 << (MAX_FDS*3 + (n))) +#define HAS_FDS ((1 << MAX_FDS*2) - 1) #define HANDLE_TYPE(handle) ((handle)->hdr.type) struct arch_frame { diff --git a/Pal/src/host/Linux-SGX/pal_host.h b/Pal/src/host/Linux-SGX/pal_host.h index 8282e4dc..cd81c603 100644 --- a/Pal/src/host/Linux-SGX/pal_host.h +++ b/Pal/src/host/Linux-SGX/pal_host.h @@ -176,11 +176,11 @@ typedef struct pal_handle }; } * PAL_HANDLE; -#define RFD(n) (00001 << (n)) -#define WFD(n) (00010 << (n)) -#define WRITABLE(n) (00100 << (n)) -#define ERROR(n) (01000 << (n)) -#define HAS_FDS 00077 +#define RFD(n) (1 << (MAX_FDS*0 + (n))) +#define WFD(n) (1 << (MAX_FDS*1 + (n))) +#define WRITABLE(n) (1 << (MAX_FDS*2 + (n))) +#define ERROR(n) (1 << (MAX_FDS*3 + (n))) +#define HAS_FDS ((1 << MAX_FDS*2) - 1) #define HANDLE_TYPE(handle) ((handle)->hdr.type) diff --git a/Pal/src/host/Linux/pal_host.h b/Pal/src/host/Linux/pal_host.h index 0d154879..6319720b 100644 --- a/Pal/src/host/Linux/pal_host.h +++ b/Pal/src/host/Linux/pal_host.h @@ -177,11 +177,11 @@ typedef struct pal_handle }; } * PAL_HANDLE; -#define RFD(n) (00001 << (n)) -#define WFD(n) (00010 << (n)) -#define WRITABLE(n) (00100 << (n)) -#define ERROR(n) (01000 << (n)) -#define HAS_FDS 00077 +#define RFD(n) (1 << (MAX_FDS*0 + (n))) +#define WFD(n) (1 << (MAX_FDS*1 + (n))) +#define WRITABLE(n) (1 << (MAX_FDS*2 + (n))) +#define ERROR(n) (1 << (MAX_FDS*3 + (n))) +#define HAS_FDS ((1 << MAX_FDS*2) - 1) #define HANDLE_TYPE(handle) ((handle)->hdr.type)