diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-08-02 09:02:30 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-17 00:01:21 +0200 |
commit | 8c3e6666c5ef612a20575e0ebcd5757ba21c47f8 (patch) | |
tree | 8d5e9c9368940c7b06c67f8f1875fc456c4656b6 /bridges/inc | |
parent | 52ac46d798a1787baca33cdf9e1c2fd768559522 (diff) |
WIN bridges: unify exception handling
This is almost just refactoring, but with classes like type_info_
and __type_info, just following the code became tendious. I tried
to come up with better names... and in the end included some minor
code changes described below.
This patch moves the "common" code for MSVC exception handling
into msvc_shared/except.cxx. Still it contains a few small ifdefs,
so it doesn't feel like clean separation, but a lot of duplicate
code is dropped this way.
The "major" code change for amd64 is the drop of the duplicate
static RTTInfo object originally used by mscx_getRTTI and
mscx_getRTTI_len, by merging of both functions into the single,
new get() function to use a single std::find call.
Change-Id: Ib07d40e2794cde79156be3324c80ccf21a6aa8ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102864
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'bridges/inc')
-rw-r--r-- | bridges/inc/msvc/amd64.hxx | 59 | ||||
-rw-r--r-- | bridges/inc/msvc/except.hxx | 118 | ||||
-rw-r--r-- | bridges/inc/msvc/x86.hxx | 68 |
3 files changed, 245 insertions, 0 deletions
diff --git a/bridges/inc/msvc/amd64.hxx b/bridges/inc/msvc/amd64.hxx new file mode 100644 index 000000000000..fb095446b097 --- /dev/null +++ b/bridges/inc/msvc/amd64.hxx @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#pragma once + +#include <msvc/except.hxx> + +#pragma pack(push, 8) + +struct ExceptionType final +{ + sal_Int32 _n0; // flags + sal_uInt32 _pTypeInfo; // typeinfo + sal_Int32 _n1, _n2, _n3; // thiscast + sal_Int32 _n4; // object_size + sal_uInt32 _pCopyCtor; // copyctor + ExceptionTypeInfo exc_type_info; + + explicit ExceptionType(unsigned char* pCode, sal_uInt64 pCodeBase, + typelib_TypeDescription* pTD) throw(); + + ExceptionType(const ExceptionType&) = delete; + ExceptionType& operator=(const ExceptionType&) = delete; +}; + +struct RaiseInfo final +{ + sal_Int32 _n0; + sal_uInt32 _pDtor; + sal_Int32 _n2; + sal_uInt32 _types; + + // Additional fields + typelib_TypeDescription* _pTD; + unsigned char* _code; + sal_uInt64 _codeBase; + + explicit RaiseInfo(typelib_TypeDescription* pTD) throw(); +}; + +#pragma pack(pop) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/inc/msvc/except.hxx b/bridges/inc/msvc/except.hxx new file mode 100644 index 000000000000..8ed49a887a24 --- /dev/null +++ b/bridges/inc/msvc/except.hxx @@ -0,0 +1,118 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#pragma once + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include <sal/config.h> +#include <rtl/ustrbuf.hxx> +#include <osl/mutex.hxx> + +#include <unordered_map> + +typedef struct _uno_Any uno_Any; +typedef struct _uno_Mapping uno_Mapping; + +int msvc_filterCppException(EXCEPTION_POINTERS*, uno_Any*, uno_Mapping*); +void msvc_raiseException(uno_Any*, uno_Mapping*); + +constexpr DWORD MSVC_EH_MAGIC_PARAM = 0x19930520; +// The NT Exception code that msvcrt uses ('msc' | 0xE0000000) +constexpr DWORD MSVC_EH_MAGIC_CODE = 0xE06D7363; + +#ifdef _M_IX86 +#define MSVC_EH_PARAMETERS 3 // Number of parameters in exception record for x86 +#else +#ifdef _M_AMD64 +#define MSVC_EH_PARAMETERS 4 // Number of parameters in exception record for AMD64 +#else +#error "Unsupported machine type" +#endif +#endif + +class type_info; +struct RaiseInfo; +typedef std::unordered_map<OUString, void*> t_string2PtrMap; +typedef struct _typelib_TypeDescription typelib_TypeDescription; + +// fixed class, because sizeof(ExceptionTypeInfo) must be sizeof(type_info) +// this is tested by a static_assert, so can't break. +class ExceptionTypeInfo final +{ + friend int msvc_filterCppException(EXCEPTION_POINTERS*, uno_Any*, uno_Mapping*); + + void* m_data; + char m_d_name[1]; + +public: + explicit ExceptionTypeInfo(void* data, const char* d_name) throw() + : m_data(data) + { + ::strcpy(m_d_name, d_name); // #100211# - checked + } + virtual ~ExceptionTypeInfo() throw(); +}; + +class ExceptionTypeInfoWrapper final +{ + int type_info_size; + ExceptionTypeInfo info; + +public: + explicit ExceptionTypeInfoWrapper(void* m_data, const char* m_d_name) throw() + : info(m_data, m_d_name) + { + type_info_size = sizeof(ExceptionTypeInfo) + strlen(m_d_name); + } + + type_info* get_type_info() { return reinterpret_cast<type_info*>(&info); } + int get_type_info_size() { return type_info_size; } +}; + +class RTTInfos final +{ + osl::Mutex m_aMutex; + t_string2PtrMap m_allRTTI; + + RTTInfos(); + ExceptionTypeInfoWrapper* getInfo(OUString const& rUNOname) throw(); + +public: + ~RTTInfos(); + + static type_info* get(OUString const& rUNOname, int* len = nullptr) throw(); +}; + +class ExceptionInfos final +{ + osl::Mutex m_aMutex; + t_string2PtrMap m_allRaiseInfos; + +public: + static RaiseInfo* getRaiseInfo(typelib_TypeDescription* pTD) throw(); + + static DWORD allocationGranularity; + + ExceptionInfos() throw(); + ~ExceptionInfos() throw(); +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/inc/msvc/x86.hxx b/bridges/inc/msvc/x86.hxx new file mode 100644 index 000000000000..24c55499f111 --- /dev/null +++ b/bridges/inc/msvc/x86.hxx @@ -0,0 +1,68 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#pragma once + +#include <msvc/except.hxx> + +#pragma pack(push, 8) + +struct ObjectFunction final +{ + char somecode[12]; + typelib_TypeDescription* _pTypeDescr; // type of object + + inline static void* operator new(size_t nSize); + inline static void operator delete(void* pMem); + + ObjectFunction(typelib_TypeDescription* pTypeDescr, void* fpFunc) throw(); + ~ObjectFunction() throw(); +}; + +struct ExceptionType final +{ + sal_Int32 _n0; + type_info* _pTypeInfo; + sal_Int32 _n1, _n2, _n3, _n4; + ObjectFunction* _pCopyCtor; + sal_Int32 _n5; + + explicit ExceptionType(typelib_TypeDescription* pTypeDescr) throw(); + ~ExceptionType() throw(); + + // Copy assignment is forbidden and not implemented. + ExceptionType(const ExceptionType&) = delete; + ExceptionType& operator=(const ExceptionType&) = delete; +}; + +struct RaiseInfo final +{ + sal_Int32 _n0; + ObjectFunction* _pDtor; + sal_Int32 _n2; + void* _types; + sal_Int32 _n3, _n4; + + explicit RaiseInfo(typelib_TypeDescription* pTypeDescr) throw(); + ~RaiseInfo() throw(); +}; + +#pragma pack(pop) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |