CVS log for src/sys/compat/freebsd32/freebsd32_util.h
![[BACK]](/gifs/back.gif){kind=small}
Up to [FreeBSD] / src / sys / compat / freebsd32
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
Revision 1.20.2.1.2.1: download - view: text, markup, annotated - select for diffs
Fri Nov 11 04:20:22 2011 UTC (2 months, 4 weeks ago) by kensmith
Branches: RELENG_9_0
CVS tags: RELENG_9_0_0_RELEASE
Diff to: previous 1.20.2.1: preferred, colored
Changes since revision 1.20.2.1: +0 -0 lines
SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release cycle. Approved by: re (implicit)
Revision 1.20.2.1: download - view: text, markup, annotated - select for diffs
Fri Sep 23 00:51:37 2011 UTC (4 months, 2 weeks ago) by kensmith
Branches: RELENG_9
CVS tags: RELENG_9_0_BP
Branch point for: RELENG_9_0
Diff to: previous 1.20: preferred, colored
Changes since revision 1.20: +0 -0 lines
SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith Copy head to stable/9 as part of 9.0-RELEASE release cycle. Approved by: re (implicit)
Revision 1.20: download - view: text, markup, annotated - select for diffs
Fri Sep 16 13:58:51 2011 UTC (4 months, 3 weeks ago) by kmacy
Branches: MAIN
CVS tags: RELENG_9_BP, HEAD
Branch point for: RELENG_9
Diff to: previous 1.19: preferred, colored
Changes since revision 1.19: +9 -0 lines
SVN rev 225617 on 2011-09-16 13:58:51Z by kmacy In order to maximize the re-usability of kernel code in user space this patch modifies makesyscalls.sh to prefix all of the non-compatibility calls (e.g. not linux_, freebsd32_) with sys_ and updates the kernel entry points and all places in the code that use them. It also fixes an additional name space collision between the kernel function psignal and the libc function of the same name by renaming the kernel psignal kern_psignal(). By introducing this change now we will ease future MFCs that change syscalls. Reviewed by: rwatson Approved by: re (bz)
Revision 1.12.2.7: download - view: text, markup, annotated - select for diffs
Tue Mar 1 21:51:32 2011 UTC (11 months, 1 week ago) by kib
Branches: RELENG_8
Diff to: previous 1.12.2.6: preferred, colored; branchpoint 1.12: preferred, colored; next MAIN 1.13: preferred, colored
Changes since revision 1.12.2.6: +4 -0 lines
SVN rev 219155 on 2011-03-01 21:51:32Z by kib MFC r210431: Remove the linux_exec_copyin_args(), freebsd32_exec_copyin_args() may serve as well. COMPAT_FREEBSD32 is a prerequisite for COMPAT_LINUX32. MFC r210451: Use forward declartion for enum uio_seg in imgact.h. This allows to remove inclusion of sys/uio.h from the header. MFC r210498: Revert r210451, and the similar part of the r210431. The forward-declaration for the enum tag when enum definition is not complete is not allowed by C99, and is gcc extension. MFC r210501: Remove unneeded includes. Requested by: dchagin
Revision 1.10.10.1.6.1: download - view: text, markup, annotated - select for diffs
Tue Dec 21 17:10:29 2010 UTC (13 months, 2 weeks ago) by kensmith
Branches: RELENG_7_4
CVS tags: RELENG_7_4_0_RELEASE
Diff to: previous 1.10.10.1: preferred, colored; next MAIN 1.10.16.1: preferred, colored
Changes since revision 1.10.10.1: +0 -0 lines
SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release. Approved by: re (implicit)
Revision 1.12.2.6.4.1: download - view: text, markup, annotated - select for diffs
Tue Dec 21 17:09:25 2010 UTC (13 months, 2 weeks ago) by kensmith
Branches: RELENG_8_2
CVS tags: RELENG_8_2_0_RELEASE
Diff to: previous 1.12.2.6: preferred, colored; next MAIN 1.12.2.7: preferred, colored
Changes since revision 1.12.2.6: +0 -0 lines
SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release. Approved by: re (implicit)
Revision 1.19: download - view: text, markup, annotated - select for diffs
Mon Jul 26 12:52:44 2010 UTC (18 months, 2 weeks ago) by kib
Branches: MAIN
Diff to: previous 1.18: preferred, colored
Changes since revision 1.18: +1 -1 lines
SVN rev 210498 on 2010-07-26 12:52:44Z by kib Revert r210451, and the similar part of the r210431. The forward-declaration for the enum tag when enum definition is not complete is not allowed by C99, and is gcc extension. Requested by: stefanf MFC after: 28 days
Revision 1.18: download - view: text, markup, annotated - select for diffs
Fri Jul 23 21:30:33 2010 UTC (18 months, 2 weeks ago) by kib
Branches: MAIN
Diff to: previous 1.17: preferred, colored
Changes since revision 1.17: +4 -0 lines
SVN rev 210431 on 2010-07-23 21:30:33Z by kib Remove the linux_exec_copyin_args(), freebsd32_exec_copyin_args() may server as well. COMPAT_FREEBSD32 is a prerequisite for COMPAT_LINUX32. Reviewed by: alc MFC after: 3 weeks
Revision 1.12.2.6.2.1: download - view: text, markup, annotated - select for diffs
Mon Jun 14 02:09:06 2010 UTC (19 months, 4 weeks ago) by kensmith
Branches: RELENG_8_1
CVS tags: RELENG_8_1_0_RELEASE
Diff to: previous 1.12.2.6: preferred, colored; next MAIN 1.12.2.7: preferred, colored
Changes since revision 1.12.2.6: +0 -0 lines
SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith Copy stable/8 to releng/8.1 in preparation for 8.1-RC1. Approved by: re (implicit)
Revision 1.12.2.6: download - view: text, markup, annotated - select for diffs
Wed Apr 28 09:59:28 2010 UTC (21 months, 1 week ago) by kib
Branches: RELENG_8
CVS tags: RELENG_8_2_BP, RELENG_8_1_BP
Branch point for: RELENG_8_2, RELENG_8_1
Diff to: previous 1.12.2.5: preferred, colored; branchpoint 1.12: preferred, colored
Changes since revision 1.12.2.5: +4 -1 lines
SVN rev 207316 on 2010-04-28 09:59:28Z by kib MFC r207007: Extract the code to copy-out struct rusage32 from struct rusage into the new function.
Revision 1.17: download - view: text, markup, annotated - select for diffs
Wed Apr 21 19:28:01 2010 UTC (21 months, 2 weeks ago) by kib
Branches: MAIN
Diff to: previous 1.16: preferred, colored
Changes since revision 1.16: +4 -1 lines
SVN rev 207007 on 2010-04-21 19:28:01Z by kib Extract the code to copy-out struct rusage32 from struct rusage into the new function. Reviewed by: jhb MFC after: 1 week
Revision 1.12.2.5: download - view: text, markup, annotated - select for diffs
Wed Apr 7 14:28:47 2010 UTC (22 months ago) by kib
Branches: RELENG_8
Diff to: previous 1.12.2.4: preferred, colored; branchpoint 1.12: preferred, colored
Changes since revision 1.12.2.4: +11 -0 lines
SVN rev 206347 on 2010-04-07 14:28:47Z by kib MFC r205321: Introduce SYSCALL_INIT_HELPER and SYSCALL32_INIT_HELPER macros and neccessary support functions to allow registering dynamically loaded syscalls from the MOD_LOAD handlers. Helpers handle registration failures semi-automatically.
Revision 1.12.2.4: download - view: text, markup, annotated - select for diffs
Wed Apr 7 14:22:38 2010 UTC (22 months ago) by kib
Branches: RELENG_8
Diff to: previous 1.12.2.3: preferred, colored; branchpoint 1.12: preferred, colored
Changes since revision 1.12.2.3: +1 -1 lines
SVN rev 206346 on 2010-04-07 14:22:38Z by kib MFC r205320: For SYSCALL_MODULE_HELPER, use "sys/<syscallname>" module name. For SYSCALL32_MODULE_HELPER, use "sys32/<syscallname>" module name. This avoids modules name conflict when compat32 syscall does not need shims.
Revision 1.12.2.3: download - view: text, markup, annotated - select for diffs
Wed Apr 7 14:09:29 2010 UTC (22 months ago) by kib
Branches: RELENG_8
Diff to: previous 1.12.2.2: preferred, colored; branchpoint 1.12: preferred, colored
Changes since revision 1.12.2.2: +3 -0 lines
SVN rev 206344 on 2010-04-07 14:09:29Z by kib MFC r205319: Make freebsd32_copyiniov() available outside of freebsd32_misc.
Revision 1.12.2.2: download - view: text, markup, annotated - select for diffs
Wed Apr 7 02:24:41 2010 UTC (22 months ago) by nwhitehorn
Branches: RELENG_8
Diff to: previous 1.12.2.1: preferred, colored; branchpoint 1.12: preferred, colored
Changes since revision 1.12.2.1: +2 -0 lines
SVN rev 206336 on 2010-04-07 02:24:41Z by nwhitehorn MFC r205014,205015: Provide groundwork for 32-bit binary compatibility on non-x86 platforms, for upcoming 64-bit PowerPC and MIPS support. This renames the COMPAT_IA32 option to COMPAT_FREEBSD32, removes some IA32-specific code from MI parts of the kernel and enhances the freebsd32 compatibility code to support big-endian platforms. This MFC is required for MFCs of later changes to the freebsd32 compatibility from HEAD. Requested by: kib
Revision 1.16: download - view: text, markup, annotated - select for diffs
Fri Mar 19 10:56:30 2010 UTC (22 months, 3 weeks ago) by kib
Branches: MAIN
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +11 -0 lines
SVN rev 205321 on 2010-03-19 10:56:30Z by kib Introduce SYSCALL_INIT_HELPER and SYSCALL32_INIT_HELPER macros and neccessary support functions to allow registering dynamically loaded syscalls from the MOD_LOAD handlers. Helpers handle registration failures semi-automatically. Reviewed by: jhb MFC after: 2 weeks
Revision 1.15: download - view: text, markup, annotated - select for diffs
Fri Mar 19 10:52:54 2010 UTC (22 months, 3 weeks ago) by kib
Branches: MAIN
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +1 -1 lines
SVN rev 205320 on 2010-03-19 10:52:54Z by kib FOr SYSCALL_MODULE_HELPER, use "sys/<syscallname>" module name. FOr SYSCALL32_MODULE_HELPER, use "sys32/<syscallname>" module name. This avoids modules name conflict when compat32 syscall does not need shims. Note that SYSCALL_MODULE_HELPER is going to be unused in the tree by several next commits. Suggested by: jhb MFC after: 2 weeks
Revision 1.14: download - view: text, markup, annotated - select for diffs
Fri Mar 19 10:49:03 2010 UTC (22 months, 3 weeks ago) by kib
Branches: MAIN
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +3 -0 lines
SVN rev 205319 on 2010-03-19 10:49:03Z by kib Make freebsd32_copyiniov() available outside of freebsd32_misc. MFC after: 2 weeks
Revision 1.13: download - view: text, markup, annotated - select for diffs
Thu Mar 11 14:49:06 2010 UTC (23 months ago) by nwhitehorn
Branches: MAIN
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +2 -0 lines
SVN rev 205014 on 2010-03-11 14:49:06Z by nwhitehorn Provide groundwork for 32-bit binary compatibility on non-x86 platforms, for upcoming 64-bit PowerPC and MIPS support. This renames the COMPAT_IA32 option to COMPAT_FREEBSD32, removes some IA32-specific code from MI parts of the kernel and enhances the freebsd32 compatibility code to support big-endian platforms. Reviewed by: kib, jhb
Revision 1.10.10.1.4.1: download - view: text, markup, annotated - select for diffs
Wed Feb 10 00:26:20 2010 UTC (2 years ago) by kensmith
Branches: RELENG_7_3
CVS tags: RELENG_7_3_0_RELEASE
Diff to: previous 1.10.10.1: preferred, colored; next MAIN 1.10.16.1: preferred, colored
Changes since revision 1.10.10.1: +0 -0 lines
SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process. Approved by: re (implicit)
Revision 1.12.2.1.2.1: download - view: text, markup, annotated - select for diffs
Sun Oct 25 01:10:29 2009 UTC (2 years, 3 months ago) by kensmith
Branches: RELENG_8_0
CVS tags: RELENG_8_0_0_RELEASE
Diff to: previous 1.12.2.1: preferred, colored; next MAIN 1.12.2.2: preferred, colored
Changes since revision 1.12.2.1: +0 -0 lines
SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure. Approved by: re (implicit)
Revision 1.12.2.1: download - view: text, markup, annotated - select for diffs
Mon Aug 3 08:13:06 2009 UTC (2 years, 6 months ago) by kensmith
Branches: RELENG_8
CVS tags: RELENG_8_0_BP
Branch point for: RELENG_8_0
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +0 -0 lines
SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith Copy head to stable/8 as part of 8.0 Release cycle. Approved by: re (Implicit)
Revision 1.10.10.1.2.1: download - view: text, markup, annotated - select for diffs
Wed Apr 15 03:14:26 2009 UTC (2 years, 9 months ago) by kensmith
Branches: RELENG_7_2
CVS tags: RELENG_7_2_0_RELEASE
Diff to: previous 1.10.10.1: preferred, colored; next MAIN 1.10.16.1: preferred, colored
Changes since revision 1.10.10.1: +0 -0 lines
SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE. Approved by: re (implicit)
Revision 1.10.2.1: download - view: text, markup, annotated - select for diffs
Wed Jan 21 16:28:15 2009 UTC (3 years ago) by jhb
Branches: RELENG_6
Diff to: previous 1.10: preferred, colored; next MAIN 1.11: preferred, colored
Changes since revision 1.10: +39 -5 lines
SVN rev 187536 on 2009-01-21 16:28:15Z by jhb MFC: Add support for installing 32-bit system calls from kernel modules.
Revision 1.10.10.1: download - view: text, markup, annotated - select for diffs
Wed Jan 21 16:14:43 2009 UTC (3 years ago) by jhb
Branches: RELENG_7
CVS tags: RELENG_7_4_BP, RELENG_7_3_BP, RELENG_7_2_BP
Branch point for: RELENG_7_4, RELENG_7_3, RELENG_7_2
Diff to: previous 1.10: preferred, colored; next MAIN 1.11: preferred, colored
Changes since revision 1.10: +39 -5 lines
SVN rev 187535 on 2009-01-21 16:14:43Z by jhb MFC: Add support for installing 32-bit system calls from kernel modules.
Revision 1.10.18.1: download - view: text, markup, annotated - select for diffs
Tue Nov 25 02:59:29 2008 UTC (3 years, 2 months ago) by kensmith
Branches: RELENG_7_1
CVS tags: RELENG_7_1_0_RELEASE
Diff to: previous 1.10: preferred, colored; next MAIN 1.11: preferred, colored
Changes since revision 1.10: +0 -0 lines
SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith Create releng/7.1 in preparation for moving into RC phase of 7.1 release cycle. Approved by: re (implicit)
Revision 1.10.16.1: download - view: text, markup, annotated - select for diffs
Thu Oct 2 02:57:24 2008 UTC (3 years, 4 months ago) by kensmith
Branches: RELENG_6_4
CVS tags: RELENG_6_4_0_RELEASE
Diff to: previous 1.10: preferred, colored; next MAIN 1.11: preferred, colored
Changes since revision 1.10: +0 -0 lines
SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith Create releng/6.4 from stable/6 in preparation for 6.4-RC1. Approved by: re (implicit)
Revision 1.12: download - view: text, markup, annotated - select for diffs
Thu Sep 25 20:50:21 2008 UTC (3 years, 4 months ago) by jhb
Branches: MAIN
CVS tags: RELENG_8_BP
Branch point for: RELENG_8
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +30 -0 lines
SVN rev 183365 on 2008-09-25 20:50:21Z by jhb
Add support for installing 32-bit system calls from kernel modules. This
includes syscall32_{de,}register() routines as well as a module handler
and wrapper macros similar to the support for native syscalls in
<sys/sysent.h>.
MFC after: 1 month
Revision 1.11: download - view: text, markup, annotated - select for diffs
Thu Sep 25 20:12:38 2008 UTC (3 years, 4 months ago) by jhb
Branches: MAIN
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +9 -5 lines
SVN rev 183363 on 2008-09-25 20:12:38Z by jhb Sort includes and add multiple include guards.
Revision 1.10: download - view: text, markup, annotated - select for diffs
Wed Jun 29 15:16:20 2005 UTC (6 years, 7 months ago) by jhb
Branches: MAIN
CVS tags: RELENG_7_BP, RELENG_7_1_BP, RELENG_7_0_BP, RELENG_7_0_0_RELEASE, RELENG_7_0, RELENG_6_BP, RELENG_6_4_BP, RELENG_6_3_BP, RELENG_6_3_0_RELEASE, RELENG_6_3, RELENG_6_2_BP, RELENG_6_2_0_RELEASE, RELENG_6_2, RELENG_6_1_BP, RELENG_6_1_0_RELEASE, RELENG_6_1, RELENG_6_0_BP, RELENG_6_0_0_RELEASE, RELENG_6_0
Branch point for: RELENG_7_1, RELENG_7, RELENG_6_4, RELENG_6
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +0 -24 lines
- Change the commented out freebsd32_xxx() example to use kern_xxx() along with a single copyin() + translate and translate + copyout() rather than using the stackgap. - Remove implementation of the stackgap for freebsd32 since it is no longer used for that compat ABI. Approved by: re (scottl)
Revision 1.9: download - view: text, markup, annotated - select for diffs
Tue Dec 23 02:48:11 2003 UTC (8 years, 1 month ago) by peter
Branches: MAIN
CVS tags: RELENG_5_BP, RELENG_5_5_BP, RELENG_5_5_0_RELEASE, RELENG_5_5, RELENG_5_4_BP, RELENG_5_4_0_RELEASE, RELENG_5_4, RELENG_5_3_BP, RELENG_5_3_0_RELEASE, RELENG_5_3, RELENG_5
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +0 -19 lines
Eliminate stackgap usage for the (woefully incomplete) path translations since it isn't needed here anymore. Use standard open(2)/access(2) and chflags(2) syscalls now.
Revision 1.8: download - view: text, markup, annotated - select for diffs
Sat Aug 23 00:04:52 2003 UTC (8 years, 5 months ago) by peter
Branches: MAIN
CVS tags: RELENG_5_2_BP, RELENG_5_2_1_RELEASE, RELENG_5_2_0_RELEASE, RELENG_5_2
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +4 -0 lines
Switch to using the emulator in the common compat area. Still work-in-progress.
Revision 1.7: download - view: text, markup, annotated - select for diffs
Fri Aug 22 23:07:28 2003 UTC (8 years, 5 months ago) by peter
Branches: MAIN
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +9 -7 lines
Initial sweep to de-i386-ify this
Revision 1.6: download - view: text, markup, annotated - select for diffs
Fri May 23 05:07:33 2003 UTC (8 years, 8 months ago) by peter
Branches: MAIN
CVS tags: old_RELENG_5_1_BP, old_RELENG_5_1_0_RELEASE, old_RELENG_5_1
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +1 -1 lines
Deal with the user VM space expanding. 32 bit applications do not like having their stack at the 512GB mark. Give 4GB of user VM space for 32 bit apps. Note that this is significantly more than on i386 which gives only about 2.9GB of user VM to a process (1GB for kernel, plus page table pages which eat user VM space). Approved by: re (blanket)
Revision 1.5: download - view: text, markup, annotated - select for diffs
Wed May 14 04:10:49 2003 UTC (8 years, 9 months ago) by peter
Branches: MAIN
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +1 -1 lines
Add BASIC i386 binary support for the amd64 kernel. This is largely stolen from the ia64/ia32 code (indeed there was a repocopy), but I've redone the MD parts and added and fixed a few essential syscalls. It is sufficient to run i386 binaries like /bin/ls, /usr/bin/id (dynamic) and p4. The ia64 code has not implemented signal delivery, so I had to do that. Before you say it, yes, this does need to go in a common place. But we're in a freeze at the moment and I didn't want to risk breaking ia64. I will sort this out after the freeze so that the common code is in a common place. On the AMD64 side, this required adding segment selector context switch support and some other support infrastructure. The %fs/%gs etc code is hairy because loading %gs will clobber the kernel's current MSR_GSBASE setting. The segment selectors are not used by the kernel, so they're only changed at context switch time or when changing modes. This still needs to be optimized. Approved by: re (amd64/* blanket)
Revision 1.1.2.1: download - view: text, markup, annotated - select for diffs
Thu Dec 19 09:40:09 2002 UTC (9 years, 1 month ago) by alfred
Branches: old_old_RELENG_5_0
CVS tags: old_old_RELENG_5_0_0_RELEASE
Diff to: previous 1.1: preferred, colored; next MAIN 1.2: preferred, colored
Changes since revision 1.1: +0 -5 lines
MFC: SCARGS and syscallargs removal. Approved by: re@ (rwatson)
Revision 1.4: download - view: text, markup, annotated - select for diffs
Sat Dec 14 01:56:25 2002 UTC (9 years, 1 month ago) by alfred
Branches: MAIN
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +0 -5 lines
SCARGS removal take II.
Revision 1.3: download - view: text, markup, annotated - select for diffs
Fri Dec 13 22:41:46 2002 UTC (9 years, 1 month ago) by alfred
Branches: MAIN
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +5 -0 lines
Backout removal SCARGS, the code freeze is only "selectively" over.
Revision 1.2: download - view: text, markup, annotated - select for diffs
Fri Dec 13 22:27:24 2002 UTC (9 years, 1 month ago) by alfred
Branches: MAIN
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +0 -5 lines
Remove SCARGS. Reviewed by: md5
Revision 1.1: download - view: text, markup, annotated - select for diffs
Sat Jul 20 02:56:10 2002 UTC (9 years, 6 months ago) by peter
Branches: MAIN
CVS tags: old_old_RELENG_5_0_BP
Branch point for: old_old_RELENG_5_0
Infrastructure tweaks to allow having both an Elf32 and an Elf64 executable handler in the kernel at the same time. Also, allow for the exec_new_vmspace() code to build a different sized vmspace depending on the executable environment. This is a big help for execing i386 binaries on ia64. The ELF exec code grows the ability to map partial pages when there is a page size difference, eg: emulating 4K pages on 8K or 16K hardware pages. Flesh out the i386 emulation support for ia64. At this point, the only binary that I know of that fails is cvsup, because the cvsup runtime tries to execute code in pages not marked executable. Obtained from: dfr (mostly, many tweaks from me).