[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[631] mplayerxp/osdep
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[631] mplayerxp/osdep
|
From: <nic...@us...> - 2013-04-23 12:51:14
|
Revision: 631
http://sourceforge.net/p/mplayerxp/code/631
Author: nickols_k
Date: 2013-04-23 12:51:09 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
move mallocs into separate header
Modified Paths:
--------------
mplayerxp/osdep/mplib.h
Added Paths:
-----------
mplayerxp/osdep/mp_malloc.h
Added: mplayerxp/osdep/mp_malloc.h
===================================================================
--- mplayerxp/osdep/mp_malloc.h (rev 0)
+++ mplayerxp/osdep/mp_malloc.h 2013-04-23 12:51:09 UTC (rev 631)
@@ -0,0 +1,98 @@
+/*
+ * mp_malloc.h - Memory Protected malloc
+ *
+ * You can redistribute this file under terms and conditions
+ * of GNU General Public licence v3.
+ */
+#ifndef __MP_MALLOC_H_INCLUDED__
+#define __MP_MALLOC_H_INCLUDED__ 1
+
+#include <string>
+
+#include <execinfo.h>
+#include <stddef.h>
+#include <sys/mman.h>
+#include "mpxp_config.h"
+
+namespace mpxp {
+
+ extern volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total;
+
+#if defined ( ENABLE_PROFILE ) && (defined ( ARCH_X86 ) || defined( ARCH_X86_64 ))
+ inline unsigned long long int read_tsc( void ) {
+ unsigned long long int retval;
+ __asm __volatile ("rdtsc":"=A"(retval)::"memory");
+ return retval;
+ }
+#define PROFILE_RESET() (my_profile_total=0ULL)
+#define PROFILE_START() { static int inited=0; if(!inited) { inited=1; my_profile_total=0ULL; } my_profile_start=read_tsc(); }
+#define PROFILE_END(your_message) { my_profile_end=read_tsc(); my_profile_total+=(my_profile_end-my_profile_start); printf(your_message" current=%llu total=%llu\n\t",(my_profile_end-my_profile_start),my_profile_total); }
+#else
+#define PROFILE_RESET()
+#define PROFILE_START()
+#define PROFILE_END(your_message)
+#endif
+/** Initializes randomizer for malloc.
+ * @param rnd_limit upper limit of random generator (recommened: 1000)
+ * @param every_nth_call how often call randimzer (recommened: 10)
+ * @note Pseudo-randomizing memory objects makes memory
+ * exploits harder
+*/
+ enum mp_malloc_e {
+ MPA_FLG_RANDOMIZER = 0x00000000,
+ MPA_FLG_BOUNDS_CHECK = 0x00000001,
+ MPA_FLG_BEFORE_CHECK = 0x00000002,
+ MPA_FLG_BACKTRACE = 0x00000004
+ };
+ void __FASTCALL__ mp_init_malloc(const std::string& argv0,unsigned rnd_limit,unsigned every_nth_call,enum mp_malloc_e flags);
+ void __FASTCALL__ mp_uninit_malloc(int verbose);
+
+ any_t* __FASTCALL__ mp_malloc(size_t __size);
+ any_t* __FASTCALL__ mp_mallocz(size_t __size);
+ any_t* __FASTCALL__ mp_realloc(any_t*__ptr, size_t __size);
+ inline any_t* mp_calloc (size_t __nelem, size_t __size) { return mp_mallocz(__nelem*__size); }
+ any_t* __FASTCALL__ mp_memalign (size_t boundary, size_t __size);
+ void __FASTCALL__ mp_free(any_t*__ptr);
+ char * __FASTCALL__ mp_strdup(const char *src);
+
+ /* flags: PROT_NONE, PROT_READ, PROT_WRITE, PROT_EXEC */
+ enum mp_prot_e {
+ MP_PROT_READ =0x1, /* Page can be read. */
+ MP_PROT_WRITE =0x2, /* Page can be written. */
+ MP_PROT_EXEC =0x4, /* Page can be executed. */
+ MP_DENY_ALL =0x0, /* Page can not be accessed. */
+ };
+ int __FASTCALL__ mp_mprotect(any_t* addr,size_t len,enum mp_prot_e flags);
+ void print_backtrace(const std::string& why,any_t** stack,unsigned num);
+
+ inline void show_backtrace(const std::string& why,unsigned num_calls) {
+ any_t* stack[num_calls];
+ unsigned ncalls;
+ ncalls=backtrace(stack,num_calls);
+ print_backtrace(why,stack,ncalls);
+ }
+ any_t* __FASTCALL__ rnd_fill(any_t* buffer,size_t size);
+ any_t* __FASTCALL__ make_false_pointer(any_t* tmplt);
+ any_t* __FASTCALL__ make_false_pointer_to(any_t* tmplt,unsigned size);
+ any_t* __FASTCALL__ fill_false_pointers(any_t* buffer,size_t size);
+ any_t* get_caller_address(unsigned num_caller=0);
+
+} // namespace mpxp
+
+/* Note: it seems that compiler cannot distinguish which version of operators
+ new and delete to use: from global namespace or from user specified */
+#include <new>
+enum zeromemory_t{ zeromem=0 };
+enum alignedmemory_t{ alignmem=0 };
+any_t* operator new(size_t size);
+any_t* operator new(size_t size,const zeromemory_t&);
+any_t* operator new(size_t size,const alignedmemory_t&,size_t boundary);
+any_t* operator new(size_t size,const std::nothrow_t&);
+any_t* operator new[](size_t size);
+any_t* operator new[](size_t size,const zeromemory_t&);
+any_t* operator new[](size_t size,const alignedmemory_t&,size_t boundary);
+any_t* operator new[](size_t size,const std::nothrow_t&);
+void operator delete(any_t* p);
+void operator delete[](any_t* p);
+
+#endif
Modified: mplayerxp/osdep/mplib.h
===================================================================
--- mplayerxp/osdep/mplib.h 2013-04-17 14:04:33 UTC (rev 630)
+++ mplayerxp/osdep/mplib.h 2013-04-23 12:51:09 UTC (rev 631)
@@ -15,70 +15,10 @@
#include <stddef.h>
#include <sys/mman.h>
#include "mpxp_config.h"
+#include "mp_malloc.h"
namespace mpxp {
- extern volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total;
-
-#if defined ( ENABLE_PROFILE ) && (defined ( ARCH_X86 ) || defined( ARCH_X86_64 ))
- inline unsigned long long int read_tsc( void ) {
- unsigned long long int retval;
- __asm __volatile ("rdtsc":"=A"(retval)::"memory");
- return retval;
- }
-#define PROFILE_RESET() (my_profile_total=0ULL)
-#define PROFILE_START() { static int inited=0; if(!inited) { inited=1; my_profile_total=0ULL; } my_profile_start=read_tsc(); }
-#define PROFILE_END(your_message) { my_profile_end=read_tsc(); my_profile_total+=(my_profile_end-my_profile_start); printf(your_message" current=%llu total=%llu\n\t",(my_profile_end-my_profile_start),my_profile_total); }
-#else
-#define PROFILE_RESET()
-#define PROFILE_START()
-#define PROFILE_END(your_message)
-#endif
-/** Initializes randomizer for malloc.
- * @param rnd_limit upper limit of random generator (recommened: 1000)
- * @param every_nth_call how often call randimzer (recommened: 10)
- * @note Pseudo-randomizing memory objects makes memory
- * exploits harder
-*/
- enum mp_malloc_e {
- MPA_FLG_RANDOMIZER = 0x00000000,
- MPA_FLG_BOUNDS_CHECK = 0x00000001,
- MPA_FLG_BEFORE_CHECK = 0x00000002,
- MPA_FLG_BACKTRACE = 0x00000004
- };
- void __FASTCALL__ mp_init_malloc(const std::string& argv0,unsigned rnd_limit,unsigned every_nth_call,enum mp_malloc_e flags);
- void __FASTCALL__ mp_uninit_malloc(int verbose);
-
- any_t* __FASTCALL__ mp_malloc(size_t __size);
- any_t* __FASTCALL__ mp_mallocz(size_t __size);
- any_t* __FASTCALL__ mp_realloc(any_t*__ptr, size_t __size);
- inline any_t* mp_calloc (size_t __nelem, size_t __size) { return mp_mallocz(__nelem*__size); }
- any_t* __FASTCALL__ mp_memalign (size_t boundary, size_t __size);
- void __FASTCALL__ mp_free(any_t*__ptr);
- char * __FASTCALL__ mp_strdup(const char *src);
-
- /* flags: PROT_NONE, PROT_READ, PROT_WRITE, PROT_EXEC */
- enum mp_prot_e {
- MP_PROT_READ =0x1, /* Page can be read. */
- MP_PROT_WRITE =0x2, /* Page can be written. */
- MP_PROT_EXEC =0x4, /* Page can be executed. */
- MP_DENY_ALL =0x0, /* Page can not be accessed. */
- };
- int __FASTCALL__ mp_mprotect(any_t* addr,size_t len,enum mp_prot_e flags);
- void print_backtrace(const std::string& why,any_t** stack,unsigned num);
-
- inline void show_backtrace(const std::string& why,unsigned num_calls) {
- any_t* stack[num_calls];
- unsigned ncalls;
- ncalls=backtrace(stack,num_calls);
- print_backtrace(why,stack,ncalls);
- }
- any_t* __FASTCALL__ rnd_fill(any_t* buffer,size_t size);
- any_t* __FASTCALL__ make_false_pointer(any_t* tmplt);
- any_t* __FASTCALL__ make_false_pointer_to(any_t* tmplt,unsigned size);
- any_t* __FASTCALL__ fill_false_pointers(any_t* buffer,size_t size);
- any_t* get_caller_address(unsigned num_caller=0);
-
template <typename T> class LocalPtr {
public:
LocalPtr(T* value):ptr(value) {}
@@ -102,21 +42,4 @@
any_t* unusable;
};
} // namespace mpxp
-
-/* Note: it seems that compiler cannot distinguish which version of operators
- new and delete to use: from global namespace or from user specified */
-#include <new>
-enum zeromemory_t{ zeromem=0 };
-enum alignedmemory_t{ alignmem=0 };
-any_t* operator new(size_t size);
-any_t* operator new(size_t size,const zeromemory_t&);
-any_t* operator new(size_t size,const alignedmemory_t&,size_t boundary);
-any_t* operator new(size_t size,const std::nothrow_t&);
-any_t* operator new[](size_t size);
-any_t* operator new[](size_t size,const zeromemory_t&);
-any_t* operator new[](size_t size,const alignedmemory_t&,size_t boundary);
-any_t* operator new[](size_t size,const std::nothrow_t&);
-void operator delete(any_t* p);
-void operator delete[](any_t* p);
-
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
