ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc - Issue 193313002: Pepper: Move GetSandboxISA() to PPB_NaCl_Private.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ppapi/native_client/src/trusted/plugin/arch_x86/sandbox_isa.cc

Issue 193313002: Pepper: Move GetSandboxISA() to PPB_NaCl_Private. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nacl_interface threading fix Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
	(Empty)
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.

4

5 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"

6 #include "ppapi/native_client/src/trusted/plugin/nexe_arch.h"

7

8 // The list of supported ISA strings for x86. See issue:

9 // http://code.google.com/p/nativeclient/issues/detail?id=1040 for more

10 // information. Note that these string are to be case-insensitive compared.

11 const char kNexeArchX86_64[] = "x86-64";

12 #if !((NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \

13 (defined(NACL_LINUX) \|\| defined(NACL_OSX)))

14 const char kNexeArchX86_32[] = "x86-32";

15 #endif

16

17 namespace plugin {

18 const char* GetSandboxISA() {

19 #if (NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 64) && \

20 (defined(NACL_LINUX) \|\| defined(NACL_OSX))

21 return kNexeArchX86_64; // 64-bit Linux or Mac.

22 #else

23 return NaClOsIs64BitWindows() == 1

24 ? kNexeArchX86_64 // 64-bit Windows (Chrome, Firefox)

25 : kNexeArchX86_32; // everything else.

26 #endif

27 }

28 } // namespace plugin

OLD	NEW