mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Remove debugbreak.
This commit is contained in:
chriseth
parent
cb5f2f90f6
commit
57f79ebfa6
@ -25,7 +25,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "Exceptions.h"
|
||||
#include "debugbreak.h"
|
||||
|
||||
namespace dev
|
||||
{
|
||||
@ -38,37 +37,6 @@ namespace dev
|
||||
#define ETH_FUNC __func__
|
||||
#endif
|
||||
|
||||
#define asserts(A) ::dev::assertAux(A, #A, __LINE__, __FILE__, ETH_FUNC)
|
||||
#define assertsEqual(A, B) ::dev::assertEqualAux(A, B, #A, #B, __LINE__, __FILE__, ETH_FUNC)
|
||||
|
||||
inline bool assertAux(bool _a, char const* _aStr, unsigned _line, char const* _file, char const* _func)
|
||||
{
|
||||
bool ret = _a;
|
||||
if (!ret)
|
||||
{
|
||||
std::cerr << "Assertion failed:" << _aStr << " [func=" << _func << ", line=" << _line << ", file=" << _file << "]" << std::endl;
|
||||
#if ETH_DEBUG
|
||||
debug_break();
|
||||
#endif
|
||||
}
|
||||
return !ret;
|
||||
}
|
||||
|
||||
template<class A, class B>
|
||||
inline bool assertEqualAux(A const& _a, B const& _b, char const* _aStr, char const* _bStr, unsigned _line, char const* _file, char const* _func)
|
||||
{
|
||||
bool ret = _a == _b;
|
||||
if (!ret)
|
||||
{
|
||||
std::cerr << "Assertion failed: " << _aStr << " == " << _bStr << " [func=" << _func << ", line=" << _line << ", file=" << _file << "]" << std::endl;
|
||||
std::cerr << " Fail equality: " << _a << "==" << _b << std::endl;
|
||||
#if ETH_DEBUG
|
||||
debug_break();
|
||||
#endif
|
||||
}
|
||||
return !ret;
|
||||
}
|
||||
|
||||
/// Assertion that throws an exception containing the given description if it is not met.
|
||||
/// Use it as assertThrow(1 == 1, ExceptionType, "Mathematics is wrong.");
|
||||
/// Do NOT supply an exception object as the second parameter.
|
||||
|
||||
@ -1,128 +0,0 @@
|
||||
/* Copyright (c) 2013, Scott Tsai
|
||||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef DEBUG_BREAK_H
|
||||
#define DEBUG_BREAK_H
|
||||
|
||||
#if defined(_MSC_VER) || defined(__MINGW32__)
|
||||
|
||||
#define debug_break __debugbreak
|
||||
|
||||
#else
|
||||
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
enum {
|
||||
/* gcc optimizers consider code after __builtin_trap() dead.
|
||||
* Making __builtin_trap() unsuitable for breaking into the debugger */
|
||||
DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP = 0,
|
||||
};
|
||||
|
||||
#if defined(__i386__) || defined(__x86_64__)
|
||||
enum { HAVE_TRAP_INSTRUCTION = 1, };
|
||||
__attribute__((gnu_inline, always_inline))
|
||||
static void __inline__ trap_instruction(void)
|
||||
{
|
||||
__asm__ volatile("int $0x03");
|
||||
}
|
||||
#elif defined(__thumb__)
|
||||
enum { HAVE_TRAP_INSTRUCTION = 1, };
|
||||
/* FIXME: handle __THUMB_INTERWORK__ */
|
||||
__attribute__((gnu_inline, always_inline))
|
||||
static void __inline__ trap_instruction(void)
|
||||
{
|
||||
/* See 'arm-linux-tdep.c' in GDB source.
|
||||
* Both instruction sequences below works. */
|
||||
#if 1
|
||||
/* 'eabi_linux_thumb_le_breakpoint' */
|
||||
__asm__ volatile(".inst 0xde01");
|
||||
#else
|
||||
/* 'eabi_linux_thumb2_le_breakpoint' */
|
||||
__asm__ volatile(".inst.w 0xf7f0a000");
|
||||
#endif
|
||||
|
||||
/* Known problem:
|
||||
* After a breakpoint hit, can't stepi, step, or continue in GDB.
|
||||
* 'step' stuck on the same instruction.
|
||||
*
|
||||
* Workaround: a new GDB command,
|
||||
* 'debugbreak-step' is defined in debugbreak-gdb.py
|
||||
* that does:
|
||||
* (gdb) set $instruction_len = 2
|
||||
* (gdb) tbreak *($pc + $instruction_len)
|
||||
* (gdb) jump *($pc + $instruction_len)
|
||||
*/
|
||||
}
|
||||
#elif defined(__arm__) && !defined(__thumb__)
|
||||
enum { HAVE_TRAP_INSTRUCTION = 1, };
|
||||
__attribute__((gnu_inline, always_inline))
|
||||
static void __inline__ trap_instruction(void)
|
||||
{
|
||||
/* See 'arm-linux-tdep.c' in GDB source,
|
||||
* 'eabi_linux_arm_le_breakpoint' */
|
||||
__asm__ volatile(".inst 0xe7f001f0");
|
||||
/* Has same known problem and workaround
|
||||
* as Thumb mode */
|
||||
}
|
||||
#elif defined(ETH_EMSCRIPTEN)
|
||||
enum { HAVE_TRAP_INSTRUCTION = 1, };
|
||||
__attribute__((gnu_inline, always_inline))
|
||||
static void __inline__ trap_instruction(void)
|
||||
{
|
||||
asm("debugger");
|
||||
}
|
||||
#else
|
||||
enum { HAVE_TRAP_INSTRUCTION = 0, };
|
||||
#endif
|
||||
|
||||
__attribute__((gnu_inline, always_inline))
|
||||
static void __inline__ debug_break(void)
|
||||
{
|
||||
if (HAVE_TRAP_INSTRUCTION) {
|
||||
trap_instruction();
|
||||
} else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP) {
|
||||
/* raises SIGILL on Linux x86{,-64}, to continue in gdb:
|
||||
* (gdb) handle SIGILL stop nopass
|
||||
* */
|
||||
__builtin_trap();
|
||||
} else {
|
||||
raise(SIGTRAP);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@ -85,7 +85,7 @@ public:
|
||||
AssemblyItem const& back() const { return m_items.back(); }
|
||||
std::string backString() const { return m_items.size() && m_items.back().type() == PushString ? m_strings.at((h256)m_items.back().data()) : std::string(); }
|
||||
|
||||
void onePath() { if (asserts(!m_totalDeposit && !m_baseDeposit)) BOOST_THROW_EXCEPTION(InvalidDeposit()); m_baseDeposit = m_deposit; m_totalDeposit = INT_MAX; }
|
||||
void onePath() { assertThrow(!m_totalDeposit && !m_baseDeposit, InvalidDeposit, ""); m_baseDeposit = m_deposit; m_totalDeposit = INT_MAX; }
|
||||
void otherPath() { donePath(); m_totalDeposit = m_deposit; m_deposit = m_baseDeposit; }
|
||||
void donePaths() { donePath(); m_totalDeposit = m_baseDeposit = 0; }
|
||||
void ignored() { m_baseDeposit = m_deposit; }
|
||||
@ -93,8 +93,8 @@ public:
|
||||
|
||||
void injectStart(AssemblyItem const& _i);
|
||||
int deposit() const { return m_deposit; }
|
||||
void adjustDeposit(int _adjustment) { m_deposit += _adjustment; if (asserts(m_deposit >= 0)) BOOST_THROW_EXCEPTION(InvalidDeposit()); }
|
||||
void setDeposit(int _deposit) { m_deposit = _deposit; if (asserts(m_deposit >= 0)) BOOST_THROW_EXCEPTION(InvalidDeposit()); }
|
||||
void adjustDeposit(int _adjustment) { m_deposit += _adjustment; assertThrow(m_deposit >= 0, InvalidDeposit, ""); }
|
||||
void setDeposit(int _deposit) { m_deposit = _deposit; assertThrow(m_deposit >= 0, InvalidDeposit, ""); }
|
||||
|
||||
/// Changes the source location used for each appended item.
|
||||
void setSourceLocation(SourceLocation const& _location) { m_currentSourceLocation = _location; }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user